diff --git a/security/john/Makefile b/security/john/Makefile
index b7db6e8e91c..df99ac6945f 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,51 +1,54 @@
-# $OpenBSD: Makefile,v 1.33 2005/09/15 22:52:01 aanriot Exp $
+# $OpenBSD: Makefile,v 1.34 2006/01/06 04:26:09 cathcart Exp $
 
 COMMENT=		"extremely fast password cracker"
 
-DISTNAME=		john-1.6.39
+DISTNAME=		john-1.6.40
 CATEGORIES=		security
 
 HOMEPAGE=		http://www.openwall.com/john/
 
+MAINTAINER=		David Cathcart <cathcart@openbsd.org>
+
 # GPL & Public Domain
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c m
+WANTLIB=		c
 
 MASTER_SITES=		${HOMEPAGE}c/
-DISTFILES=		${DISTNAME}.tar.gz \
-			john-1.6.tar.gz
 
 NO_REGRESS=		Yes
 
 WRKSRC=			${WRKDIST}/src
+
 MAKE_FLAGS=		CC=${CC} AS=${CC} LD=${CC} \
-			CFLAGS="${CFLAGS} -c"
+			CFLAGS="${CFLAGS} -c" LDFLAGS="${LDFLAGS}"
 
 .if ${MACHINE_ARCH} == "i386"
 FLAVORS=		no_mmx
 FLAVOR?=
-.if ${FLAVOR:L:Mno_mmx}
-ALL_TARGET=		openbsd-x86-any-elf
-.else
-ALL_TARGET=		openbsd-x86-mmx-elf
-.endif
+.  if ${FLAVOR:L:Mno_mmx}
+ALL_TARGET=		openbsd-x86-any
+.  else
+ALL_TARGET=		openbsd-x86-mmx
+.  endif
+.elif ${MACHINE_ARCH} == "amd64"
+ALL_TARGET=		openbsd-x86-64
 .elif ${MACHINE_ARCH} == "sparc"
 ALL_TARGET=		openbsd-sparc
 .elif ${MACHINE_ARCH} == "vax"
 ALL_TARGET=		openbsd-vax
 .elif ${MACHINE_ARCH} == "alpha"
-ALL_TARGET=		linux-alpha
+ALL_TARGET=		openbsd-alpha
 .elif ${MACHINE_ARCH} == "powerpc"
-ALL_TARGET=		linux-ppc32
+ALL_TARGET=		openbsd-ppc32
 .elif ${MACHINE_ARCH} == "powerpc64"
-ALL_TARGET=		linux-ppc64
+ALL_TARGET=		openbsd-ppc64
 .elif ${MACHINE_ARCH} == "hppa"
-ALL_TARGET=		hpux-pa-risc-${CC}
+ALL_TARGET=		openbsd-pa-risc
 .elif ${MACHINE_ARCH} == "sparc64"
-ALL_TARGET=		"openbsd-sparc64"
+ALL_TARGET=		openbsd-sparc64
 .else
 ALL_TARGET=		generic
 .endif
@@ -58,6 +61,9 @@ do-configure:
 		${WRKDIST}/run/john.conf
 
 do-install:
+	@grep -h -v '^#!comment:' ${WRKDIST}/run/password.lst \
+		/usr/share/dict/words | \
+		${WRKDIST}/run/unique ${WRKDIST}/run/words.lst
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/john
 	${INSTALL_DATA_DIR} ${PREFIX}/share/john
@@ -68,8 +74,8 @@ do-install:
 		ln -sf john unafs && \
 		ln -sf john unique
 	${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
-	${INSTALL_DATA} ${WRKDIR}/john-1.6/doc/* ${PREFIX}/share/doc/john
 	${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
-	${INSTALL_DATA} ${WRKDIR}/john-1.6/run/*.chr ${PREFIX}/share/john
+	${INSTALL_DATA} ${WRKDIST}/run/*.chr ${PREFIX}/share/john
+	${INSTALL_DATA} ${WRKDIST}/run/words.lst ${PREFIX}/share/john/password.lst
 
 .include <bsd.port.mk>
diff --git a/security/john/distinfo b/security/john/distinfo
index c73fe61dd89..140142218be 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,8 +1,4 @@
-MD5 (john-1.6.39.tar.gz) = 823ee78095db8568aa68fb0721b1efea
-MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32
-RMD160 (john-1.6.39.tar.gz) = 1f0f5dce55b06515db22af37f91f231c41e68ec7
-RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
-SHA1 (john-1.6.39.tar.gz) = abd9a9f8269b7288f6e834b402fa4d0c8f5191de
-SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
-SIZE (john-1.6.39.tar.gz) = 167425
-SIZE (john-1.6.tar.gz) = 497341
+MD5 (john-1.6.40.tar.gz) = 507916220812c5834136d378a13e48a0
+RMD160 (john-1.6.40.tar.gz) = b54e41eec65a9c185731b2e137fb155ae2eb348b
+SHA1 (john-1.6.40.tar.gz) = 1f9fc46d10eb218065f024775578db3642d2bd20
+SIZE (john-1.6.40.tar.gz) = 797220
diff --git a/security/john/patches/patch-run_john_conf b/security/john/patches/patch-run_john_conf
deleted file mode 100644
index ef28c544e6f..00000000000
--- a/security/john/patches/patch-run_john_conf
+++ /dev/null
@@ -1,42 +0,0 @@
-$OpenBSD: patch-run_john_conf,v 1.2 2005/09/06 20:20:26 aanriot Exp $
---- run/john.conf.orig	Fri Jun 11 14:29:39 2004
-+++ run/john.conf	Tue Sep  6 15:51:38 2005
-@@ -5,7 +5,7 @@
- 
- [Options]
- # Wordlist file name, to be used in batch mode
--Wordlist = $JOHN/password.lst
-+Wordlist = /usr/share/dict/words
- # Use idle cycles only
- Idle = N
- # Crash recovery file saving delay in seconds
-@@ -316,25 +316,25 @@ l$1$9<-$[6-0]$[9-0]
- 
- # Incremental modes
- [Incremental:All]
--File = $JOHN/all.chr
-+File = %%JOHN%%/all.chr
- MinLen = 0
- MaxLen = 8
- CharCount = 95
- 
- [Incremental:Alpha]
--File = $JOHN/alpha.chr
-+File = %%JOHN%%/alpha.chr
- MinLen = 1
- MaxLen = 8
- CharCount = 26
- 
- [Incremental:Digits]
--File = $JOHN/digits.chr
-+File = %%JOHN%%/digits.chr
- MinLen = 1
- MaxLen = 8
- CharCount = 10
- 
- [Incremental:LanMan]
--File = $JOHN/lanman.chr
-+File = %%JOHN%%/lanman.chr
- MinLen = 0
- MaxLen = 7
- CharCount = 69
diff --git a/security/john/patches/patch-src_Makefile b/security/john/patches/patch-src_Makefile
index 9b235b68872..4aef9db202f 100644
--- a/security/john/patches/patch-src_Makefile
+++ b/security/john/patches/patch-src_Makefile
@@ -1,15 +1,6 @@
-$OpenBSD: patch-src_Makefile,v 1.3 2005/05/31 08:08:52 sturm Exp $
---- src/Makefile.orig	Wed May  4 19:49:31 2005
-+++ src/Makefile	Tue May 31 09:44:24 2005
-@@ -17,7 +17,7 @@ NULL = /dev/null
- CPPFLAGS = -E
- CFLAGS = -c -Wall -O2 -fomit-frame-pointer
- ASFLAGS = -c
--LDFLAGS = -s
-+LDFLAGS = -s -lm
- OPT_NORMAL = -funroll-loops
- OPT_INLINE = -finline-functions
- 
+$OpenBSD: patch-src_Makefile,v 1.4 2006/01/06 04:26:09 cathcart Exp $
+--- src/Makefile.orig	Mon Dec 12 19:53:36 2005
++++ src/Makefile	Thu Jan  5 19:40:05 2006
 @@ -249,7 +249,7 @@ openbsd-x86-any-a.out:
  	$(LN) x86-any.h arch.h
  	$(MAKE) $(PROJ) \
@@ -17,20 +8,14 @@ $OpenBSD: patch-src_Makefile,v 1.3 2005/05/31 08:08:52 sturm Exp $
 -		ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD"
 +		ASFLAGS="$(ASFLAGS) -DBSD"
  
- openbsd-sparc:
- 	$(MAKE) use-openbsd-sparc HAMMER=use-openbsd-sparc NAIL=sparc.h
-@@ -260,7 +260,13 @@ use-openbsd-sparc:
+ openbsd-x86-64:
+ 	$(LN) x86-64.h arch.h
+@@ -288,7 +288,7 @@ use-openbsd-sparc-a.out:
  	$(MAKE) $(NAIL) \
  		BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \
  		JOHN_OBJS="$(JOHN_OBJS_ORIG) sparc.o" \
 -		ASFLAGS="-c -DUNDERSCORES -DBSD"
 +		ASFLAGS="-c -DBSD"
-+
-+openbsd-sparc64:
-+	$(LN) sparc64.h arch.h
-+	$(MAKE) $(PROJ) \
-+		CFLAGS="$(CFLAGS) -m64 -mcpu=ultrasparc" \
-+		LDFLAGS="-m64 -s"
  
- openbsd-vax:
- 	$(LN) vax.h arch.h
+ openbsd-ppc32:
+ 	$(LN) ppc32.h arch.h
diff --git a/security/john/patches/patch-src_params_h b/security/john/patches/patch-src_params_h
index bc08f1926b0..3d0dc3025e1 100644
--- a/security/john/patches/patch-src_params_h
+++ b/security/john/patches/patch-src_params_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_params_h,v 1.2 2005/05/31 08:08:52 sturm Exp $
---- src/params.h.orig	Wed May 11 05:01:34 2005
-+++ src/params.h	Tue May 31 10:01:20 2005
-@@ -22,12 +22,12 @@
+$OpenBSD: patch-src_params_h,v 1.3 2006/01/06 04:26:09 cathcart Exp $
+--- src/params.h.orig	Fri Dec 16 16:47:25 2005
++++ src/params.h	Thu Jan  5 19:40:05 2006
+@@ -22,15 +22,15 @@
   * will probably want to set this to 1 for their builds of John.
   */
  #ifndef JOHN_SYSTEMWIDE
@@ -10,10 +10,13 @@ $OpenBSD: patch-src_params_h,v 1.2 2005/05/31 08:08:52 sturm Exp $
  #endif
  
  #if JOHN_SYSTEMWIDE
+ #ifndef JOHN_SYSTEMWIDE_EXEC
 -#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"
--#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
 +#define JOHN_SYSTEMWIDE_EXEC		"%%PREFIX%%/bin/john"
+ #endif
+ #ifndef JOHN_SYSTEMWIDE_HOME
+-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
 +#define JOHN_SYSTEMWIDE_HOME		"%%SYSCONFDIR%%"
+ #endif
  #define JOHN_PRIVATE_HOME		"~/.john"
  #endif
- 
diff --git a/security/john/pkg/PLIST b/security/john/pkg/PLIST
index 38d0345012e..f8afeeed519 100644
--- a/security/john/pkg/PLIST
+++ b/security/john/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2005/09/15 22:52:01 aanriot Exp $
+@comment $OpenBSD: PLIST,v 1.11 2006/01/06 04:26:09 cathcart Exp $
 bin/john
 bin/mailer
 bin/unafs
@@ -14,7 +14,6 @@ share/doc/john/FAQ
 share/doc/john/INSTALL
 share/doc/john/LICENSE
 share/doc/john/MODES
-@comment share/doc/john/NEWS
 share/doc/john/OPTIONS
 share/doc/john/README
 share/doc/john/RULES
@@ -23,6 +22,8 @@ share/examples/john/john.conf
 @sample ${SYSCONFDIR}/john.conf
 share/john/
 share/john/all.chr
+share/john/alnum.chr
 share/john/alpha.chr
 share/john/digits.chr
 share/john/lanman.chr
+share/john/password.lst