diff --git a/security/john/Makefile b/security/john/Makefile
index 779c6235bc87..17ad4913b614 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -7,15 +7,14 @@
 #
 
 PORTNAME=	john
-PORTVERSION=	1.6.37
-PORTREVISION=	1
+PORTVERSION=	1.6.39
 CATEGORIES=	security
 MASTER_SITES=	http://www.openwall.com/john/a/ \
 		ftp://ftp.ru.openwall.com/pub/projects/john/
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 		${PORTNAME}-1.6.tar.gz
 
-MAINTAINER=	dom@helenmarks.co.uk
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Featureful Unix password cracker
 
 USE_REINPLACE=	yes
diff --git a/security/john/distinfo b/security/john/distinfo
index 732cf6f459a1..16c6a99c7d75 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,4 +1,4 @@
-MD5 (john-1.6.37.tar.gz) = 9403233b640927295c05b0564ff1f678
-SIZE (john-1.6.37.tar.gz) = 139372
+MD5 (john-1.6.39.tar.gz) = 823ee78095db8568aa68fb0721b1efea
+SIZE (john-1.6.39.tar.gz) = 167425
 MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
 SIZE (john-1.6.tar.gz) = 497341
diff --git a/security/john/pkg-plist b/security/john/pkg-plist
index 39f3fdfcaf95..b7788922c357 100644
--- a/security/john/pkg-plist
+++ b/security/john/pkg-plist
@@ -1,10 +1,10 @@
 bin/john
 bin/unshadow
 bin/xtract
-share/john/all.chr
-share/john/alpha.chr
-share/john/digits.chr
-share/john/lanman.chr
-share/john/john.conf
-share/john/password.lst
+%%DATADIR%%/all.chr
+%%DATADIR%%/alpha.chr
+%%DATADIR%%/digits.chr
+%%DATADIR%%/lanman.chr
+%%DATADIR%%/john.conf
+%%DATADIR%%/password.lst
 @dirrm share/john