diff --git a/srcpkgs/binutils/binutils-devel.template b/srcpkgs/binutils/binutils-devel.template
index b59553af3c..9886569ce3 100644
--- a/srcpkgs/binutils/binutils-devel.template
+++ b/srcpkgs/binutils/binutils-devel.template
@@ -9,5 +9,6 @@ long_desc="${long_desc}
 do_install() {
 	vmove usr/include usr
 	vmove "usr/lib/*.a" usr/lib
-	vmove "usr/lib/*.so" usr/lib
+	vmove usr/lib/libbfd.so usr/lib
+	vmove usr/lib/libopcodes.so usr/lib
 }
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index eb27988506..3b2afe1148 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.22.52.0.4
-revision=1
+revision=2
 makedepends="flex perl"
 subpackages="$pkgname-devel"
 short_desc="GNU binary utilities"
@@ -26,7 +26,7 @@ long_desc="
 do_configure() {
 	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
 		--enable-64-bit-bfd --enable-multilib --enable-plugins \
-		--enable-secureplt --with-mmap
+		--enable-secureplt --with-mmap --enable-shared
 }
 
 do_build() {
@@ -87,4 +87,8 @@ do_install() {
 		mv ${DESTDIR}/usr/lib32/* ${DESTDIR}/usr/lib
 		rmdir ${DESTDIR}/usr/lib32
 	fi
+
+	# Remove the requirement of PACKAGE{,_VERSION} to be defined
+	# from bfd.h... wth?
+	sed -i 35,+3d ${DESTDIR}/usr/include/bfd.h
 }