diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
new file mode 100644
index 00000000000..bdce2f3ee35
--- /dev/null
+++ b/benchmarks/bonnie++/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2003/07/25 22:23:14 naddy Exp $
+
+COMMENT=	"enhanced performance test of filesystem I/O"
+
+DISTNAME=	bonnie++-1.03a
+CATEGORIES=	benchmarks
+
+HOMEPAGE=	http://www.coker.com.au/bonnie++/
+MASTER_SITES=	${HOMEPAGE} \
+		ftp://gd.tuwien.ac.at/opsys/linux/sf/b/bonnie/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	Martin Reindl <mreindl@catai.org>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+NO_REGRESS=	Yes
+USE_GMAKE=      Yes
+MAKE_FLAGS=	CXX="${CXX} ${CXXFLAGS}"
+
+CONFIGURE_STYLE=gnu dest
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bonnie++
+	${INSTALL_DATA} ${WRKSRC}/readme.html \
+		${PREFIX}/share/doc/bonnie++
+
+.include <bsd.port.mk>
diff --git a/benchmarks/bonnie++/distinfo b/benchmarks/bonnie++/distinfo
new file mode 100644
index 00000000000..e33c52217a6
--- /dev/null
+++ b/benchmarks/bonnie++/distinfo
@@ -0,0 +1,3 @@
+MD5 (bonnie++-1.03a.tgz) = 00b1eee7f98b68fa762c4efb3b34caa1
+RMD160 (bonnie++-1.03a.tgz) = 978825bca7cf43f5605912c26a71f23afd50074b
+SHA1 (bonnie++-1.03a.tgz) = b519b79a00fb7145d51320abc3cd46caca7ff05b
diff --git a/benchmarks/bonnie++/pkg/DESCR b/benchmarks/bonnie++/pkg/DESCR
new file mode 100644
index 00000000000..d77bd4d0b9f
--- /dev/null
+++ b/benchmarks/bonnie++/pkg/DESCR
@@ -0,0 +1,11 @@
+Bonnie++ is a benchmark suite that is aimed at performing a number of
+simple tests of hard drive and file system performance.  Then you can
+decide which test is important and decide how to compare different
+systems after running it.  I have no plans to ever have it produce a
+single number, because I don't think that a single number can be useful
+when comparing such things.
+
+The main program tests database type access to a single file (or a set
+of files if you wish to test more than 1G of storage), and it tests
+creation, reading, and deleting of small files which can simulate the
+usage of programs such as Squid, INN, or Maildir format email.
diff --git a/benchmarks/bonnie++/pkg/PLIST b/benchmarks/bonnie++/pkg/PLIST
new file mode 100644
index 00000000000..96a9850be3b
--- /dev/null
+++ b/benchmarks/bonnie++/pkg/PLIST
@@ -0,0 +1,11 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2003/07/25 22:23:14 naddy Exp $
+bin/bon_csv2html
+bin/bon_csv2txt
+man/man1/bon_csv2html.1
+man/man1/bon_csv2txt.1
+man/man8/bonnie++.8
+man/man8/zcav.8
+sbin/bonnie++
+sbin/zcav
+share/doc/bonnie++/readme.html
+@dirrm share/doc/bonnie++