diff --git a/benchmarks/nuttcp/Makefile b/benchmarks/nuttcp/Makefile
index d6a055425308..b8663e87195e 100644
--- a/benchmarks/nuttcp/Makefile
+++ b/benchmarks/nuttcp/Makefile
@@ -4,14 +4,15 @@
 PORTNAME=	nuttcp
 PORTVERSION=	7.3.2
 CATEGORIES=	benchmarks net
-MASTER_SITES=	http://nuttcp.net/nuttcp/
-DISTFILES=	beta/${PORTNAME}-${PORTVERSION}.c beta/${NUTTSCPDISTFILE} latest/${PORTNAME}.8 latest/examples.txt latest/LICENSE latest/README
+MASTER_SITES=	http://nuttcp.net/nuttcp/beta/ http://nuttcp.net/nuttcp/latest/:latest
+DISTFILES=	${PORTNAME}-${PORTVERSION}.c ${NUTTSCPDISTFILE} ${PORTNAME}.8:latest examples.txt:latest LICENSE:latest README:latest
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	# none
-WRKSRC=		${WRKDIR}
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	TCP/UDP network testing tool
 
+NO_WRKSUBDIR=	yes
 USES=		shebangfix
 SHEBANG_FILES=	nuttscp
 
@@ -26,23 +27,23 @@ OPTIONS_SUB=	yes
 NUTTSCP_USES=	perl5
 
 post-extract:
-	${CP} ${DISTDIR}/beta/${NUTTSCPDISTFILE} ${WRKDIR}/nuttscp
-	${CP} ${DISTDIR}/beta/${PORTNAME}-${PORTVERSION}.c ${WRKDIR}/
-	${CP} ${DISTDIR}/latest/${PORTNAME}.8 ${WRKDIR}/
-	${CP} ${DISTDIR}/latest/LICENSE ${WRKDIR}/
-	${CP} ${DISTDIR}/latest/README ${WRKDIR}/
-	${CP} ${DISTDIR}/latest/examples.txt ${WRKDIR}/
+	${CP} ${_DISTDIR}/${NUTTSCPDISTFILE} ${WRKSRC}/nuttscp
+	${CP} ${_DISTDIR}/${PORTNAME}-${PORTVERSION}.c ${WRKSRC}
+	${CP} ${_DISTDIR}/${PORTNAME}.8 ${WRKSRC}
+	${CP} ${_DISTDIR}/LICENSE ${WRKSRC}
+	${CP} ${_DISTDIR}/README ${WRKSRC}
+	${CP} ${_DISTDIR}/examples.txt ${WRKSRC}
 
 do-build:
-	cd ${WRKDIR} && ${CC} -o ${PORTNAME} nuttcp-${PORTVERSION}.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} nuttcp-${PORTVERSION}.c
 
 do-install-NUTTSCP-on:
-	${INSTALL_SCRIPT} ${WRKDIR}/nuttscp ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/nuttscp ${STAGEDIR}${PREFIX}/bin/
 	( cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp )
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 .	for file in LICENSE README examples.txt
diff --git a/benchmarks/nuttcp/distinfo b/benchmarks/nuttcp/distinfo
index 3785e8a98636..dc1be6be487f 100644
--- a/benchmarks/nuttcp/distinfo
+++ b/benchmarks/nuttcp/distinfo
@@ -1,12 +1,13 @@
-SHA256 (beta/nuttcp-7.3.2.c) = 4deb98a21bb8d2f75dff95436f85d616cdf321b50f29b2bf5f0ff9a0d42b0d62
-SIZE (beta/nuttcp-7.3.2.c) = 265085
-SHA256 (beta/nuttscp-2.2) = 0874f2f87b8def21bd3d1b18dab449e3d97648100d0c824af109eba897e2160d
-SIZE (beta/nuttscp-2.2) = 28729
-SHA256 (latest/nuttcp.8) = 83f10cb19e11e37a00fa78ad1f87afc02e5250777e91e78bdf2f2485d372e2c5
-SIZE (latest/nuttcp.8) = 16157
-SHA256 (latest/examples.txt) = eb94d5424880164cae4b4b5d8f4ab25299cb3396a32c4dcb136e9718c0844938
-SIZE (latest/examples.txt) = 5933
-SHA256 (latest/LICENSE) = ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6
-SIZE (latest/LICENSE) = 17987
-SHA256 (latest/README) = 7ad8dcb72bd72afed8f32a13d3f81614b659afacdfa91ca57b41ff20cd4806a1
-SIZE (latest/README) = 5666
+TIMESTAMP = 1465482030
+SHA256 (nuttcp-7.3.2/nuttcp-7.3.2.c) = 4deb98a21bb8d2f75dff95436f85d616cdf321b50f29b2bf5f0ff9a0d42b0d62
+SIZE (nuttcp-7.3.2/nuttcp-7.3.2.c) = 265085
+SHA256 (nuttcp-7.3.2/nuttscp-2.2) = 0874f2f87b8def21bd3d1b18dab449e3d97648100d0c824af109eba897e2160d
+SIZE (nuttcp-7.3.2/nuttscp-2.2) = 28729
+SHA256 (nuttcp-7.3.2/nuttcp.8) = 83f10cb19e11e37a00fa78ad1f87afc02e5250777e91e78bdf2f2485d372e2c5
+SIZE (nuttcp-7.3.2/nuttcp.8) = 16157
+SHA256 (nuttcp-7.3.2/examples.txt) = eb94d5424880164cae4b4b5d8f4ab25299cb3396a32c4dcb136e9718c0844938
+SIZE (nuttcp-7.3.2/examples.txt) = 5933
+SHA256 (nuttcp-7.3.2/LICENSE) = ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6
+SIZE (nuttcp-7.3.2/LICENSE) = 17987
+SHA256 (nuttcp-7.3.2/README) = 7ad8dcb72bd72afed8f32a13d3f81614b659afacdfa91ca57b41ff20cd4806a1
+SIZE (nuttcp-7.3.2/README) = 5666