diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a2d1143ddc9..0aae21788a8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -2,8 +2,9 @@
 pkgname=john
 version=1.7.9
 _jumbover=5
-revision=1
-wrksrc=${pkgname}-${version}-jumbo-${_jumbover}
+revision=2
+wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
+hostmakedepends="libgomp-devel"
 makedepends="libgomp-devel openssl-devel"
 conf_files="/etc/john/john.conf"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
@@ -12,26 +13,19 @@ license="GPL-2"
 homepage="http://www.openwall.com/john/"
 distfiles="$homepage/g/$pkgname-${version}-jumbo-${_jumbover}.tar.bz2"
 checksum=4007aec40d2fedb1ce3287c62f23f8a1a8b8029d22cd3cbc60bb1a42f56c1a7f
-long_desc="
- John the Ripper is a fast password cracker, currently available for many
- flavors of Unix, Windows, DOS, BeOS, and OpenVMS. Its primary purpose is
- to detect weak Unix passwords. Besides several crypt(3) password hash
- types most commonly found on various Unix systems, supported out of the
- box are Windows LM hashes, plus lots of other hashes and ciphers in the
- community-enhanced version.
 
- This package contains the community edition with the jump-${_jumbover} patch
- included by default."
+only_for_archs="i686 x86_64"
 
 do_build() {
 	sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS += -c -Wall -DJOHN_SYSTEMWIDE=1|' src/Makefile
 	sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS +=\1 -lm|' src/Makefile
 	sed -i 's|-m486||g' src/Makefile
+	sed -i 's|-msse2||g' src/Makefile
 	sed -i 's|#OMPFLAGS = -fopenmp|OMPFLAGS = -fopenmp|' src/Makefile
 
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		make ${makejobs} -C src linux-x86-64
-	elif [ "${XBPS_TARGET_MACHINE" = "i686" ]; then
+	elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 		make ${makejobs} -C src linux-x86-mmx
 	fi
 }