diff --git a/app-emulation/bochs/bochs-2.6.9.recipe b/app-emulation/bochs/bochs-2.6.9.recipe
index 0ff60c051..42658c60c 100644
--- a/app-emulation/bochs/bochs-2.6.9.recipe
+++ b/app-emulation/bochs/bochs-2.6.9.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://bochs.sourceforge.net/"
 COPYRIGHT="2001-2017 The Bochs Project"
 LICENSE="GNU LGPL v2.1
 	Bochs"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://downloads.sourceforge.net/bochs/bochs-$portVersion.tar.gz"
 CHECKSUM_SHA256="ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c"
 
@@ -21,19 +21,36 @@ REQUIRES="
 	lib:libreadline$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	"
+if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+REQUIRES+="
+	lib:libgfortran$secondaryArchSuffix
+	"
+fi
 
 BUILD_REQUIRES="
 	devel:libreadline$secondaryArchSuffix
 	devel:libsdl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
+if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+BUILD_REQUIRES+="
+	devel:libgfortran$secondaryArchSuffix
+	"
+fi
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
+	cmd:gzip
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:tar
 	"
+if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+BUILD_PREREQUIRES+="
+	cmd:gfortran$secondaryArchSuffix
+	"
+fi
 
 defineDebugInfoPackage bochs$secondaryArchSuffix \
 	"$binDir"/bochs \
@@ -41,7 +58,14 @@ defineDebugInfoPackage bochs$secondaryArchSuffix \
 
 BUILD()
 {
-	LIBS=-lnetwork runConfigure ./configure --with-sdl
+	if [ $effectiveTargetArchitecture == x86_64 ]; then
+		GCC5FLAGS="--enable-x86-64 --enable-smp"
+	fi
+
+	LIBS=-lnetwork runConfigure ./configure \
+		--with-sdl \
+		$GCC5FLAGS
+
 	make $jobArgs
 }