diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile
index d742f41bd65caf8dff27b692eec803e17dd39719..30da5224a91fcbf32947bc8204d0a3aa0bd70c90 100644
--- a/llvm/tools/Makefile
+++ b/llvm/tools/Makefile
@@ -21,12 +21,9 @@ PARALLEL_DIRS := llvm-config  \
 
 include $(LEVEL)/Makefile.config
 
-# Disable liblto as it is going away
-#PARALLEL_DIRS += lto
-
 # only build new lto project on Darwin for now
 ifeq ($(OS),Darwin)
-PARALLEL_DIRS += lto2
+PARALLEL_DIRS += lto
 endif
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/lto2/LTOCodeGenerator.cpp b/llvm/tools/lto/LTOCodeGenerator.cpp
similarity index 100%
rename from llvm/tools/lto2/LTOCodeGenerator.cpp
rename to llvm/tools/lto/LTOCodeGenerator.cpp
diff --git a/llvm/tools/lto2/LTOCodeGenerator.h b/llvm/tools/lto/LTOCodeGenerator.h
similarity index 100%
rename from llvm/tools/lto2/LTOCodeGenerator.h
rename to llvm/tools/lto/LTOCodeGenerator.h
diff --git a/llvm/tools/lto2/LTOModule.cpp b/llvm/tools/lto/LTOModule.cpp
similarity index 100%
rename from llvm/tools/lto2/LTOModule.cpp
rename to llvm/tools/lto/LTOModule.cpp
diff --git a/llvm/tools/lto2/LTOModule.h b/llvm/tools/lto/LTOModule.h
similarity index 100%
rename from llvm/tools/lto2/LTOModule.h
rename to llvm/tools/lto/LTOModule.h
diff --git a/llvm/tools/lto2/Makefile b/llvm/tools/lto/Makefile
similarity index 100%
rename from llvm/tools/lto2/Makefile
rename to llvm/tools/lto/Makefile
diff --git a/llvm/tools/lto2/lto.cpp b/llvm/tools/lto/lto.cpp
similarity index 100%
rename from llvm/tools/lto2/lto.cpp
rename to llvm/tools/lto/lto.cpp
diff --git a/llvm/tools/lto2/lto.exports b/llvm/tools/lto/lto.exports
similarity index 100%
rename from llvm/tools/lto2/lto.exports
rename to llvm/tools/lto/lto.exports