diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index 717e1337f..569bf4ed0 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -4,12 +4,6 @@
 
 # NOTE: requires rebuilt with each new gcc version
 
-# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - noautobuild, !distcc
-#  - removed multilib stuff
-
-noautobuild=1
-
 pkgname=libtool
 pkgver=2.4.4
 pkgrel=2
@@ -20,18 +14,25 @@ license=('GPL')
 groups=('base-devel')
 depends=('sh' 'tar' 'glibc')
 makedepends=('gcc')
-provides=("libltdl=$pkgver")
-conflicts=('libltdl')
-replaces=('libltdl')
+provides=("libltdl=$pkgver" "libtool-multilib=$pkgver")
+conflicts=('libltdl' 'libtool-multilib')
+replaces=('libltdl' 'libtool-multilib')
 install=libtool.install
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}
+        armv7h-nopic.patch)
 md5sums=('51bf400de3354687d68dfa2392506b7e'
-         'SKIP')
+         'SKIP'
+         '8a1fdc77814fa5db3fc4d6a888d0cd89')
 validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')
 
+prepare() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  patch -p1 -i ../armv7h-nopic.patch
+}
+
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/lib /usr/lib"
+  ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib32"
   make
 }
 
diff --git a/core/libtool/armv7h-nopic.patch b/core/libtool/armv7h-nopic.patch
new file mode 100644
index 000000000..4d14d8ddb
--- /dev/null
+++ b/core/libtool/armv7h-nopic.patch
@@ -0,0 +1,12 @@
+diff -urN a/tests/demo.at b/tests/demo.at
+--- a/tests/demo.at	2014-11-19 05:28:51.000000000 -0700
++++ b/tests/demo.at	2014-12-14 09:07:59.440233474 -0700
+@@ -510,7 +510,7 @@
+ AT_SETUP([force non-PIC objects])
+ 
+ AT_CHECK([case $host in
+-hppa*|x86_64*|s390*)
++hppa*|x86_64*|s390*|armv7*)
+   # These hosts cannot use non-PIC shared libs
+   exit 77 ;;
+ *-solaris*|*-sunos*)