diff --git a/security/john/Makefile b/security/john/Makefile
index f97574c884eb..f5e684d19c20 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -7,12 +7,20 @@
 
 PORTNAME=	john
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openwall.com/john/f/ \
 		ftp://ftp.ru.openwall.com/pub/projects/john/${PORTVERSION}/ \
 		ftp://ftp.se.openwall.com/pub/projects/john/${PORTVERSION}/ \
 		http://distro.ibiblio.org/pub/linux/distributions/openwall/projects/john/${PORTVERSION}/
 
+PATCH_SITES=	ftp://ftp.openwall.com/pub/projects/john/contrib/ \
+		http://www.mirrorgeek.com/openwall/projects/john/contrib/ \
+		ftp://ftp.cert.dfn.de/pub/tools/net/Openwall/projects/john/contrib/ \
+		http://ftp.sunet.se/pub/security/tools/net/Openwall/projects/john/contrib/
+PATCHFILES=	john-${PORTVERSION}-all-9.diff.gz
+PATCH_DIST_STRIP=	-p2
+
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Featureful Unix password cracker
 
diff --git a/security/john/distinfo b/security/john/distinfo
index 446c930f285c..57ee8f08e2c9 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,3 +1,6 @@
 MD5 (john-1.7.2.tar.bz2) = dc6a6c2a885110ccb5da4c1e2010cb07
 SHA256 (john-1.7.2.tar.bz2) = 7e2ca95ce9038771adb009133feb1b508698244449ceed84b6442f83327c5d58
 SIZE (john-1.7.2.tar.bz2) = 691706
+MD5 (john-1.7.2-all-9.diff.gz) = 1f31bea932892bf3de13a748ee82ccde
+SHA256 (john-1.7.2-all-9.diff.gz) = 44555f9c2b630d9c35597f1a4319379f4e3f452ab2103b21cee8d3ebe6d38bbe
+SIZE (john-1.7.2-all-9.diff.gz) = 70430