diff --git a/sys-devel/binutils/binutils-2.17_2016_07_24.recipe b/sys-devel/binutils/binutils-2.17_2016_07_24.recipe
index 6f40ce2cb..cbe2b3275 100644
--- a/sys-devel/binutils/binutils-2.17_2016_07_24.recipe
+++ b/sys-devel/binutils/binutils-2.17_2016_07_24.recipe
@@ -5,7 +5,7 @@ SOURCE_URI="https://github.com/haiku/buildtools/archive/$commit.tar.gz"
 SOURCE_FILENAME="$portName-$portVersion.tar.gz"
 SOURCE_DIR="buildtools-$commit/legacy/binutils"
 CHECKSUM_SHA256="23673f9e754e2301cddb4b29f0516ada757190ae7751779536073fe2060443fc"
-REVISION="3"
+REVISION="4"
 LICENSE="
 	GNU GPL v2
 	GNU LGPL v2
@@ -46,7 +46,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:makeinfo
 	cmd:sed
 	cmd:tar
 	cmd:xargs
@@ -63,9 +62,10 @@ BUILD()
 {
 	rm -rf $binutilsObjectsDir
 
-	# Touch all *.info files, as newer texinfos don't like their format
+	# Touch all *.info files, as we don't want to build them
 	cd $binutilsDir
-	find . -name \*.info | xargs touch
+	find . -name \*.info | xargs touch -d "1996-01-01 01:01:01 +0000"
+	find . -name \*.texi | xargs touch -d "1996-01-01 01:01:01 +0000"
 
 	# build binutils
 	mkdir -p $binutilsObjectsDir
@@ -74,8 +74,18 @@ BUILD()
 		"$binutilsDir/configure" \
 		--exec-prefix=$installDir \
 		--includedir=$includeDir/binutils \
-		--with-htmldir=$relativeDocDir \
 		--disable-nls --enable-shared=yes
+
+	# patch the makefiles that are too dumb to handle no makeinfo
+	sed -i 's@INFO_DEPS = $(srcdir)/gprof.info@INFO_DEPS=@' gprof/Makefile
+	sed -i 's@HTMLS = gprof.html@HTMLS=@' gprof/Makefile
+	sed -i 's@HTMLS = bfd.html@HTMLS=@' bfd/doc/Makefile
+	sed -i 's@HTMLS = binutils.html@HTMLS=@' binutils/doc/Makefile
+	sed -i 's@HTMLFILES = standards.html configure.html@HTMLFILES=@' etc/Makefile
+	sed -i 's@HTMLS = as.html@HTMLS=@' gas/doc/Makefile
+	sed -i 's@HTMLS = ld.html@HTMLS=@' ld/Makefile
+	sed -i 's@HTMLS = libiberty.html@HTMLS=@' libiberty/Makefile
+
 	make
 }
 
@@ -91,25 +101,9 @@ INSTALL()
 	rm -r $libDir
 	rm -r $developDir/headers
 
-	### HTML documentation ####################################
-
-	echo "Organizing HTML documentation..."
-	cd $docDir
-
-	mv as.html as
-	ln -sf as/index.html as.html
-	mv bfd.html bfd
-	ln -sf bfd/index.html bfd.html
-	mv binutils.html binutils
-	ln -sf binutils/index.html binutils.html
-	mv gprof.html gprof
-	ln -sf gprof/index.html gprof.html
-	mv ld.html ld
-	ln -sf ld/index.html ld.html
-	rm libiberty.html standards.html
-
 	# no info documentation
-	rm -r $infoDir
+	rm -rf $infoDir
+	rm -rf $prefix/share
 
 	### Strip #################################################