diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 25811f49d43..b4f7a410dd4 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2000/02/15 05:04:03 turan Exp $
+# $OpenBSD: Makefile,v 1.6 2000/04/08 20:01:34 espie Exp $
 
 DISTNAME=       Bonnie
 PKGNAME=	bonnie-1.0
@@ -7,15 +7,23 @@ CATEGORIES=	benchmarks
 MAINTAINER=	niklas@openbsd.org
 
 LICENSE_TYPE=		BSD
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+FAKE=			Yes
+FAKE_FLAGS=		PREFIX=${WRKINST}${PREFIX}
 
 MASTER_SITES=   ftp://ftp.sunet.se/pub/benchmark/Bonnie/ \
 		ftp://swedishchef.lerc.nasa.gov/drlabs/io/
 EXTRACT_SUFX=   .tar.Z
 
-CFLAGS+=	-static
+MAKE_FLAGS=CFLAGS='${CFLAGS} -static'
+
+do-install:
+	@${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
+	@${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKBUILD}/Bonnie ${PREFIX}/bin/bonnie
+	${INSTALL_MAN} ${FILESDIR}/bonnie.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/benchmarks/bonnie/files/bonnie.1 b/benchmarks/bonnie/files/bonnie.1
new file mode 100644
index 00000000000..7660b97e6f5
--- /dev/null
+++ b/benchmarks/bonnie/files/bonnie.1
@@ -0,0 +1,68 @@
+.\" The following requests are required for all man pages.
+.Dd May 18, 1995
+.Os UNIX
+.Dt BONNIE 1
+.Sh NAME
+.Nm bonnie
+.Nd Performance Test of Filesystem I/O
+.Sh SYNOPSIS
+.Nm bonnie
+.Op Fl d Ar scratch-dir
+.Op Fl s Ar size-in-MB
+.Op Fl m Ar machine-label
+
+.Sh DESCRIPTION
+.Nm Bonnie 
+tests the speed of file I/O from standard C library calls.
+It reads and writes 8KB blocks to find the maximum sustained 
+data rate (usually limited by the drive or controller) and additionally 
+rewrites the file (better simulating normal operating conditions and 
+quite dependent on drive and OS optimisations).
+
+The per character read and write tests are generally limited by CPU speed
+only on current generation hardware. It takes some 35 SPECint92 to read
+or write a file at a rate of 1MB/s using getc() and putc().
+
+The seek test results depend on the buffer cache size, since the fraction
+of disk blocks that fits into the buffer cache will be found without any 
+disk operation and will contribute zero seek time samples.
+(See 
+.Sx BUGS 
+below.)
+
+.Sh OPTIONS
+.Bl -tag -width indent
+.It Fl d Ar scratch-dir
+Specify the directory where the test file gets written. The default 
+is the current directory. Make sure there is sufficient free space 
+available on the partition this directory resides in.
+.It Fl s Ar size-in-MB
+Specify the size of the test file in MByte. This much space must be 
+available for the tests to complete.
+.It Fl m Ar machine-label
+Specify a label to be written in the first column of the result table.
+.El
+
+.Sh SEE ALSO
+.Xr iozone 1 ,
+.Xr iostat 8
+
+.Sh AUTHOR
+.Nm Bonnie
+was written by Tim Bray <tbray@watsol.waterloo.edu>.
+
+.Sh BUGS
+.Nm Bonnie 
+tries hard to measure disk performance and not the quality of the 
+buffer cache implementation. In merged buffer caches common today,
+the buffer cache size is often only limited by total RAM on an otherwise
+unloaded system. Be sure to use a file at least twice at large as 
+available RAM to protect against artificially high results.
+
+There is no way to keep the buffer cache from increasing the reported
+seek rate. This is because the fraction of accesses corresponding to the 
+amount of the file cached, will be done without seeks.
+If your buffer cache is half the size of the file used, then half the 
+requests will be satisfied immediately, and and the seek rate printed 
+will be twice the actual value. 
+
diff --git a/benchmarks/bonnie/patches/patch-aa b/benchmarks/bonnie/patches/patch-aa
deleted file mode 100644
index 7d4e7e90089..00000000000
--- a/benchmarks/bonnie/patches/patch-aa
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -C2 Makefile~ Makefile
-*** Makefile~	Wed Aug 21 17:19:11 1991
---- Makefile	Thu May 18 20:27:19 1995
-***************
-*** 1,7 ****
-  
-! CC = cc
-! CFLAGS = -O2
-  
-! all:	Bonnie 
-! 
-! Bonnie:
---- 1,10 ----
-+ all:	bonnie
-  
-! bonnie:
-! 	$(CC) $(CFLAGS) -static -o bonnie Bonnie.c
-  
-! install:
-! 	-@mkdir -p ${PREFIX}/bin
-! 	-@mkdir -p ${PREFIX}/man/man1
-! 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} bonnie ${PREFIX}/bin
-! 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 bonnie.1 ${PREFIX}/man/man1
-diff -C2 /dev/null bonnie.1
-*** /dev/null	Thu May 18 20:25:21 1995
---- bonnie.1	Thu May 18 20:26:47 1995
-***************
-*** 0 ****
---- 1,68 ----
-+ .\" The following requests are required for all man pages.
-+ .Dd May 18, 1995
-+ .Os UNIX
-+ .Dt BONNIE 1
-+ .Sh NAME
-+ .Nm bonnie
-+ .Nd Performance Test of Filesystem I/O
-+ .Sh SYNOPSIS
-+ .Nm bonnie
-+ .Op Fl d Ar scratch-dir
-+ .Op Fl s Ar size-in-MB
-+ .Op Fl m Ar machine-label
-+ 
-+ .Sh DESCRIPTION
-+ .Nm Bonnie 
-+ tests the speed of file I/O from standard C library calls.
-+ It reads and writes 8KB blocks to find the maximum sustained 
-+ data rate (usually limited by the drive or controller) and additionally 
-+ rewrites the file (better simulating normal operating conditions and 
-+ quite dependent on drive and OS optimisations).
-+ 
-+ The per character read and write tests are generally limited by CPU speed
-+ only on current generation hardware. It takes some 35 SPECint92 to read
-+ or write a file at a rate of 1MB/s using getc() and putc().
-+ 
-+ The seek test results depend on the buffer cache size, since the fraction
-+ of disk blocks that fits into the buffer cache will be found without any 
-+ disk operation and will contribute zero seek time samples.
-+ (See 
-+ .Sx BUGS 
-+ below.)
-+ 
-+ .Sh OPTIONS
-+ .Bl -tag -width indent
-+ .It Fl d Ar scratch-dir
-+ Specify the directory where the test file gets written. The default 
-+ is the current directory. Make sure there is sufficient free space 
-+ available on the partition this directory resides in.
-+ .It Fl s Ar size-in-MB
-+ Specify the size of the test file in MByte. This much space must be 
-+ available for the tests to complete.
-+ .It Fl m Ar machine-label
-+ Specify a label to be written in the first column of the result table.
-+ .El
-+ 
-+ .Sh SEE ALSO
-+ .Xr iozone 1 ,
-+ .Xr iostat 8
-+ 
-+ .Sh AUTHOR
-+ .Nm Bonnie
-+ was written by Tim Bray <tbray@watsol.waterloo.edu>.
-+ 
-+ .Sh BUGS
-+ .Nm Bonnie 
-+ tries hard to measure disk performance and not the quality of the 
-+ buffer cache implementation. In merged buffer caches common today,
-+ the buffer cache size is often only limited by total RAM on an otherwise
-+ unloaded system. Be sure to use a file at least twice at large as 
-+ available RAM to protect against artificially high results.
-+ 
-+ There is no way to keep the buffer cache from increasing the reported
-+ seek rate. This is because the fraction of accesses corresponding to the 
-+ amount of the file cached, will be done without seeks.
-+ If your buffer cache is half the size of the file used, then half the 
-+ requests will be satisfied immediately, and and the seek rate printed 
-+ will be twice the actual value. 
-+