diff --git a/Makefile.common b/Makefile.common
index afe6990256a..c3f5af22011 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -266,9 +266,9 @@ PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
 # Libtool is found in the current directory.
 #
 ifdef VERBOSE
-LIBTOOL=$(LLVM_SRC_ROOT)/libtool
+LIBTOOL=$(LLVM_SRC_ROOT)/mklib
 else
-LIBTOOL=$(LLVM_SRC_ROOT)/libtool --silent
+LIBTOOL=$(LLVM_SRC_ROOT)/mklib --silent
 endif
 
 #
diff --git a/Makefile.rules b/Makefile.rules
index afe6990256a..c3f5af22011 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -266,9 +266,9 @@ PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
 # Libtool is found in the current directory.
 #
 ifdef VERBOSE
-LIBTOOL=$(LLVM_SRC_ROOT)/libtool
+LIBTOOL=$(LLVM_SRC_ROOT)/mklib
 else
-LIBTOOL=$(LLVM_SRC_ROOT)/libtool --silent
+LIBTOOL=$(LLVM_SRC_ROOT)/mklib --silent
 endif
 
 #
diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index 0298d89434c..f5ea270c124 100644
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -82,7 +82,7 @@ AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) $(top_builddir)/mklib'
 AC_SUBST(LIBTOOL)dnl
 
 # Prevent multiple expansion
@@ -149,7 +149,7 @@ no_glob_subst='s/\*/\\\*/g'
 rm="rm -f"
 
 # Global variables:
-default_ofile=libtool
+default_ofile=mklib
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except M$VC,
diff --git a/configure b/configure
index 872dda15453..fad8e24a8a7 100755
--- a/configure
+++ b/configure
@@ -5140,7 +5140,7 @@ no_glob_subst='s/\*/\\\*/g'
 rm="rm -f"
 
 # Global variables:
-default_ofile=libtool
+default_ofile=mklib
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except M$VC,
@@ -17880,7 +17880,7 @@ fi
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) $(top_builddir)/mklib'
 
 # Prevent multiple expansion