diff --git a/crypto/external/bsd/netpgp/bin/Makefile b/crypto/external/bsd/netpgp/bin/Makefile
index fc5078d4296d..86b9b1b12c7c 100644
--- a/crypto/external/bsd/netpgp/bin/Makefile
+++ b/crypto/external/bsd/netpgp/bin/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2012/11/20 05:26:25 agc Exp $
+#	$NetBSD: Makefile,v 1.5 2014/03/09 00:24:47 agc Exp $
 
+SUBDIR+=	netpgp
 SUBDIR+=	netpgpverify
 
 .include <bsd.subdir.mk>
diff --git a/crypto/external/bsd/netpgp/netpgp/Makefile b/crypto/external/bsd/netpgp/bin/netpgp/Makefile
similarity index 53%
rename from crypto/external/bsd/netpgp/netpgp/Makefile
rename to crypto/external/bsd/netpgp/bin/netpgp/Makefile
index 3c284860a5b8..2bd29478b886 100644
--- a/crypto/external/bsd/netpgp/netpgp/Makefile
+++ b/crypto/external/bsd/netpgp/bin/netpgp/Makefile
@@ -1,17 +1,17 @@
-#	$NetBSD: Makefile,v 1.4 2012/07/10 19:38:17 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2014/03/09 00:24:47 agc Exp $
 
 .include <bsd.own.mk>
 
 PROG=		netpgp
 BINDIR=		/usr/bin
 
-CPPFLAGS+=	-I${.CURDIR}/../dist/include
+CPPFLAGS+=	-I${EXTDIST}/include
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 
-LIBMJDIR!=	cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
+LIBMJDIR!=	cd ${.CURDIR}/../../libmj && ${PRINTOBJDIR}
 LDADD+=		-L${LIBMJDIR} -lmj
 DPADD+=		${LIBMJDIR}/libmj.a
 
@@ -20,6 +20,7 @@ DPADD+=		${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
 
 MAN=		netpgp.1
 
-.PATH: ${.CURDIR}/../dist/src/netpgp
+EXTDIST=	${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/netpgp
 
 .include <bsd.prog.mk>