diff --git a/srcpkgs/bonnie++/template b/srcpkgs/bonnie++/template
index 7336aa31957..dd01371dd6c 100644
--- a/srcpkgs/bonnie++/template
+++ b/srcpkgs/bonnie++/template
@@ -11,11 +11,16 @@ homepage="http://www.coker.com.au/bonnie++/"
 distfiles="http://www.coker.com.au/bonnie++/experimental/bonnie++-${version}.tgz"
 checksum=44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982
 
+post_extract() {
+	sed -i -e 's/sbin/bin/g' \
+		-e '/-o getc_putc_helper/s/CXX/LINK/' \
+		-e '/$(LINK)/s/$/ $(LDFLAGS)/' \
+		-e 's/@mandir@/$(eprefix)&/g' \
+		 Makefile.in
+}
+pre_build() {
+	export MORECFLAGS="$CFLAGS"
+}
 do_install() {
 	make prefix=${DESTDIR}/usr install
-	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
-	vmkdir usr/share/man/man1
-	vmkdir usr/share/man/man8
-	install -m644 *.1 ${DESTDIR}/usr/share/man/man1
-	install -m644 *.8 ${DESTDIR}/usr/share/man/man8
 }