diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 3f5c070..7063520 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -39,9 +39,6 @@ prepare() {
   # Turn off development mode (-Werror, gas run-time checks, date in sonames)
   sed -i '/^development=/s/true/false/' bfd/development.sh
 
-  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
-
   # Creds @Fedora
   # Change the gold configuration script to only warn about
   # unsupported targets.  This allows the binutils to be built with
@@ -65,7 +62,6 @@ build() {
     --enable-gold \
     --enable-install-libiberty \
     --enable-ld=default \
-    --enable-lto \
     --enable-pgo-build=lto \
     --enable-plugins \
     --enable-relro \
@@ -111,7 +107,7 @@ package() {
   install -m644 libiberty/pic/libiberty.a "$pkgdir/usr/lib"
 
   # Remove unwanted files
-  rm -f "$pkgdir"/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
+  rm -f "$pkgdir"/usr/share/man/man1/{dlltool,windres,windmc}*
 
   # No shared linking to these files outside binutils
   rm -f "$pkgdir"/usr/lib/lib{bfd,opcodes}.so