diff --git a/benchmarks/netperf-wrapper/Makefile b/benchmarks/netperf-wrapper/Makefile
index ea96325415c..1faaa749890 100644
--- a/benchmarks/netperf-wrapper/Makefile
+++ b/benchmarks/netperf-wrapper/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2015/11/06 17:10:05 bentley Exp $
+# $OpenBSD: Makefile,v 1.6 2015/11/06 20:42:26 sthen Exp $
 
 COMMENT=	test network latency under load via netperf
 
 MODPY_EGG_VERSION= 0.9.1
+REVISION=	1
 DISTNAME=	netperf-wrapper-${MODPY_EGG_VERSION}
-REVISION=	0
 
 CATEGORIES=	benchmarks net
 
diff --git a/benchmarks/netperf-wrapper/patches/patch-setup_py b/benchmarks/netperf-wrapper/patches/patch-setup_py
new file mode 100644
index 00000000000..7c20b93b91d
--- /dev/null
+++ b/benchmarks/netperf-wrapper/patches/patch-setup_py
@@ -0,0 +1,12 @@
+$OpenBSD: patch-setup_py,v 1.1 2015/11/06 20:42:26 sthen Exp $
+--- setup.py.orig	Fri Nov  6 10:22:20 2015
++++ setup.py	Fri Nov  6 10:22:26 2015
+@@ -91,7 +91,7 @@ data_files = [('share/netperf-wrapper', ['matplotlibrc
+               ('share/doc/netperf-wrapper',
+                ['BUGS',
+                 'README.rst']+glob("*.example")),
+-              ('share/man/man1',
++              ('man/man1',
+                ['man/netperf-wrapper.1']),
+               ('share/doc/netperf-wrapper/misc',
+                glob("misc/*")),
diff --git a/benchmarks/netperf-wrapper/pkg/DESCR b/benchmarks/netperf-wrapper/pkg/DESCR
index c6c9e6d8067..98a3c9f6f33 100644
--- a/benchmarks/netperf-wrapper/pkg/DESCR
+++ b/benchmarks/netperf-wrapper/pkg/DESCR
@@ -1,19 +1,17 @@
 Python wrapper to run multiple simultaneous netperf/iperf/ping instances
 and aggregate the results.
 
-Several commands can be run in parallel and, provided they output
-timestamped values, the test data points can be aligned with each other
-in time, interpolating differences between the actual measurement points.
-This makes it possible to graph (e.g.) ping times before, during and
-after a link is loaded.
+Several commands can be run in parallel and the test data points can be
+aligned with each other in time, interpolating differences between the
+actual measurement points.  This makes it possible to graph (e.g.) ping
+times before, during and after a link is loaded.
 
 Aggregated data can be saved in a json format, output as csv values,
-emacs org mode tables or, if py-matplotlib is installed, plots.
-Each test can specify several different plots, including time-series
-plots of the values against each other, as well as CDF plots of
-(e.g.) ping times.
+emacs org mode tables, or graph plots.  Each test can specify several
+plots, including time-series plots of the values against each other,
+as well as CDF plots of (e.g.) ping times.
 
-Examples (see homepage or netperf-wrapper -h for more):
+Quick examples (see homepage or manual for more):
 
 1. netperf-wrapper -H somehost ping -f plot
 
diff --git a/benchmarks/netperf-wrapper/pkg/PLIST b/benchmarks/netperf-wrapper/pkg/PLIST
index e3f427de9cb..db6b5b4c3f2 100644
--- a/benchmarks/netperf-wrapper/pkg/PLIST
+++ b/benchmarks/netperf-wrapper/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/11/06 17:10:05 bentley Exp $
+@comment $OpenBSD: PLIST,v 1.4 2015/11/06 20:42:26 sthen Exp $
 bin/netperf-wrapper
 lib/python${MODPY_VERSION}/site-packages/netperf_wrapper/
 lib/python${MODPY_VERSION}/site-packages/netperf_wrapper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
@@ -32,13 +32,13 @@ lib/python${MODPY_VERSION}/site-packages/netperf_wrapper/transformers.py
 lib/python${MODPY_VERSION}/site-packages/netperf_wrapper/transformers.pyc
 lib/python${MODPY_VERSION}/site-packages/netperf_wrapper/util.py
 lib/python${MODPY_VERSION}/site-packages/netperf_wrapper/util.pyc
+@man man/man1/netperf-wrapper.1
 share/applications/netperf-wrapper.desktop
 share/doc/netperf-wrapper/
 share/doc/netperf-wrapper/BUGS
 share/doc/netperf-wrapper/README.rst
 share/doc/netperf-wrapper/batchfile.example
 share/doc/netperf-wrapper/misc/
-@comment share/doc/netperf-wrapper/misc/fping_timestamps.patch
 share/doc/netperf-wrapper/misc/ditg-control-server.py
 share/doc/netperf-wrapper/misc/ditg-ignore-client-log.patch
 share/doc/netperf-wrapper/misc/iperf-server.py
@@ -47,9 +47,6 @@ share/doc/netperf-wrapper/misc/tcpdump-wrapper.py
 share/doc/netperf-wrapper/misc/test-exec.sh
 share/doc/netperf-wrapper/misc/testcontrol-web-service.py
 share/doc/netperf-wrapper/netperf-wrapperrc.example
-share/man/
-share/man/man1/
-@man share/man/man1/netperf-wrapper.1
 share/mime/packages/netperf-wrapper-mime.xml
 share/netperf-wrapper/
 share/netperf-wrapper/matplotlibrc.dist