diff --git a/security/nacl/Makefile b/security/nacl/Makefile
index c3e6d1331e58..1bdf700528b5 100644
--- a/security/nacl/Makefile
+++ b/security/nacl/Makefile
@@ -7,22 +7,20 @@ PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://hyperelliptic.org/nacl/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= 	johans@FreeBSD.org
 COMMENT=	High speed cryptography library
 
+USES=		tar:bzip2
 ALL_TARGET=	do
-USE_BZIP2=	yes
 USE_BINUTILS=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
+BROKEN_ia64=	Does not compile on ia64, powerpc, or sparc64
+BROKEN_powerpc=	Does not compile on ia64, powerpc, or sparc64
+BROKEN_sparc64=	Does not compile on ia64, powerpc, or sparc64
 
 HOSTNAME_CMD?=	/bin/hostname -s
+MYARCH=		${ARCH:S/i386/x86/:S/powerpc/ppc/}
 
 post-patch:
 	@${REINPLACE_CMD} -i -e "s/$$/ -fPIC/" ${WRKSRC}/okcompilers/c
@@ -35,38 +33,20 @@ pre-build:
 do-build:
 	cd ${WRKSRC} && ./do
 
+.include <bsd.port.pre.mk>
+
 post-build:
-.if ${ARCH} == "i386"
-	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/libnacl.a \
-		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/randombytes.o
-.elif ${ARCH} == "powerpc"
-	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/libnacl.a \
-		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/randombytes.o
-.else
-	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/libnacl.a \
-		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/randombytes.o
-.endif
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/randombytes.o
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha256 \
-		${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha512 \
-		${PREFIX}/bin
-.if ${ARCH} == "i386"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/* \
-		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/x86/* \
-		${PREFIX}/include
-.elif ${ARCH} == "powerpc"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/* \
-		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/ppc/* \
-		${PREFIX}/include
-.else
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/* \
-		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/${ARCH}/* \
-		${PREFIX}/include
-.endif
+		${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/* \
+		${STAGEDIR}${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/${MYARCH}/* \
+		${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.post.mk>