diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index 8a1332c4090e..3407402f5746 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -1,46 +1,36 @@
 # Created by: Pete Fritchman <petef@databits.net>
 # $FreeBSD$
 
 PORTNAME=	iperf
 PORTVERSION=	2.0.5
 CATEGORIES=	benchmarks
 MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tool to measure maximum TCP and UDP bandwidth
 
 LICENSE=	BSD
 
 OPTIONS_DEFINE=	DOCS IPV6 THREADS
 OPTIONS_DEFAULT=THREADS
 
 GNU_CONFIGURE=	yes
 
-MAN1=		iperf.1
-PLIST_FILES=	bin/iperf
+PLIST_FILES=	bin/iperf \
+		man/man1/iperf.1.gz
 PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIPV6}
-CATEGORIES+=	ipv6
-CONFIGURE_ARGS+=--enable-ipv6
-.else
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
+IPV6_CATEGORIES=	ipv6
+IPV6_CONFIGURE_ENABLE=	ipv6
+THREADS_CONFIGURE_ENABLE=	threads
+THREADS_LDFLAGS=	-pthread
 
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-LDFLAGS+=	${PTHREAD_LIBS}
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} README doc/*.gif doc/*.html ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} README doc/*.gif doc/*.html ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>