diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6871e654fb1..1d216924b15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,7 +419,6 @@ add_subdirectory(utils/count)
 add_subdirectory(utils/not)
 add_subdirectory(utils/llvm-lit)
 add_subdirectory(utils/yaml-bench)
-add_subdirectory(utils/yaml2obj)
 
 add_subdirectory(projects)
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9b80ee5a23a..6b7c884516a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -44,6 +44,7 @@ add_subdirectory(llvm-mcmarkup)
 add_subdirectory(llvm-symbolizer)
 
 add_subdirectory(obj2yaml)
+add_subdirectory(yaml2obj)
 
 if( NOT WIN32 )
   add_subdirectory(lto)
diff --git a/tools/Makefile b/tools/Makefile
index b8f21d2ce19..eaf9ed35772 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -35,7 +35,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llvm-diff macho-dump llvm-objdump llvm-readobj \
 	         llvm-rtdyld llvm-dwarfdump llvm-cov \
 	         llvm-size llvm-stress llvm-mcmarkup \
-	         llvm-symbolizer obj2yaml
+	         llvm-symbolizer obj2yaml yaml2obj
 
 # If Intel JIT Events support is configured, build an extra tool to test it.
 ifeq ($(USE_INTEL_JITEVENTS), 1)
diff --git a/utils/yaml2obj/CMakeLists.txt b/tools/yaml2obj/CMakeLists.txt
similarity index 100%
rename from utils/yaml2obj/CMakeLists.txt
rename to tools/yaml2obj/CMakeLists.txt
diff --git a/utils/yaml2obj/Makefile b/tools/yaml2obj/Makefile
similarity index 95%
rename from utils/yaml2obj/Makefile
rename to tools/yaml2obj/Makefile
index e746d851900..cb6f47724b6 100644
--- a/utils/yaml2obj/Makefile
+++ b/tools/yaml2obj/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = yaml2obj
-USEDLIBS = LLVMSupport.a
+LINK_COMPONENTS := support
 
 # This tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1
diff --git a/utils/yaml2obj/yaml2obj.cpp b/tools/yaml2obj/yaml2obj.cpp
similarity index 100%
rename from utils/yaml2obj/yaml2obj.cpp
rename to tools/yaml2obj/yaml2obj.cpp
diff --git a/utils/Makefile b/utils/Makefile
index 7a3c17d0325..ecb30bed7c6 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ..
 PARALLEL_DIRS := FileCheck FileUpdate TableGen PerfectShuffle \
-	      count fpcmp llvm-lit not unittest yaml2obj
+	      count fpcmp llvm-lit not unittest
 
 EXTRA_DIST := check-each-file codegen-diff countloc.sh \
               DSAclean.py DSAextract.py emacs findsym.pl GenLibDeps.pl \