diff --git a/.cvsignore b/.cvsignore
index 53ce7a5..84bdc54 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bonnie++-1.03c.tgz
+bonnie++-1.03e.tgz
diff --git a/bonnie++-1.03a-gcc43.patch b/bonnie++-1.03a-gcc43.patch
deleted file mode 100644
index d700bf7..0000000
--- a/bonnie++-1.03a-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up bonnie++-1.03a/zcav.cpp.gcc43 bonnie++-1.03a/zcav.cpp
---- bonnie++-1.03a/zcav.cpp.gcc43	2008-02-08 20:19:25.000000000 -0500
-+++ bonnie++-1.03a/zcav.cpp	2008-02-08 20:19:37.000000000 -0500
-@@ -9,6 +9,7 @@ using namespace std;
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "bonnie.h"
- #ifdef HAVE_VECTOR
- #include <vector>
-@@ -72,7 +73,7 @@ int main(int argc, char *argv[])
-           usage();
-         userName = strdup(optarg);
-         int i;
--        for(i = 0; userName[i] && userName[i] != ':'; i++);
-+        for(i = 0; userName[i] && userName[i] != ':'; i++) ;
-         if(userName[i] == ':')
-         {
-           if(groupName)
diff --git a/bonnie++-1.03a-mandir.patch b/bonnie++-1.03a-mandir.patch
deleted file mode 100644
index 027d5b0..0000000
--- a/bonnie++-1.03a-mandir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile~	2003-01-09 00:34:20.000000000 +0200
-+++ Makefile	2003-05-19 01:09:34.000000000 +0300
-@@ -6,6 +6,7 @@
- 
- prefix=/usr/local
- eprefix=${prefix}
-+mandir=${prefix}/man
- #MORE_WARNINGS=-Weffc++ -Wcast-align
- WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope $(MORE_WARNINGS)
- CFLAGS=-O2  -DNDEBUG $(WFLAGS) $(MORECFLAGS)
-@@ -38,9 +39,9 @@
- 	${INSTALL} $(SCRIPTS) $(eprefix)/bin
- 
- install: install-bin
--	mkdir -p ${prefix}/man/man1 ${prefix}/man/man8
--	${INSTALL} -m 644 $(MAN1) ${prefix}/man/man1
--	${INSTALL} -m 644 $(MAN8) ${prefix}/man/man8
-+	mkdir -p ${mandir}/man1 ${mandir}/man8
-+	${INSTALL} -m 644 $(MAN1) ${mandir}/man1
-+	${INSTALL} -m 644 $(MAN8) ${mandir}/man8
- 
- %.o: %.cpp %.h bonnie.h port.h
- 	$(CXX) -c $<
diff --git a/bonnie++-1.03e-makefile.patch b/bonnie++-1.03e-makefile.patch
new file mode 100644
index 0000000..9f6bfd5
--- /dev/null
+++ b/bonnie++-1.03e-makefile.patch
@@ -0,0 +1,32 @@
+--- bonnie++-1.03e.orig/Makefile.in	2002-10-13 15:26:36.000000000 -0500
++++ bonnie++-1.03e/Makefile.in	2009-05-13 16:02:22.000000000 -0500
+@@ -14,6 +14,8 @@
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ 
++DESTDIR=
++
+ BONSRC=bon_io.cpp bon_file.cpp bon_time.cpp semaphore.cpp forkit.cpp \
+  bon_suid.cpp
+ BONOBJS=$(BONSRC:.cpp=.o)
+@@ -33,14 +35,14 @@
+ 	$(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS)
+ 
+ install-bin: $(EXES)
+-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
+-	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
+-	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
++	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
++	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
++	@INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin
+ 
+ install: install-bin
+-	mkdir -p @mandir@/man1 @mandir@/man8
+-	@INSTALL_DATA@ $(MAN1) @mandir@/man1
+-	@INSTALL_DATA@ $(MAN8) @mandir@/man8
++	mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8
++	@INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1
++	@INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8
+ 
+ %.o: %.cpp %.h bonnie.h port.h
+ 	$(CXX) -c $<
diff --git a/bonnie++.spec b/bonnie++.spec
index 8c1caa8..4444246 100644
--- a/bonnie++.spec
+++ b/bonnie++.spec
@@ -1,15 +1,15 @@
 Name:           bonnie++
-Version:        1.03c
-Release:        2%{?dist}
+Version:        1.03e
+Release:        1%{?dist}
 
 Summary:        Filesystem and disk benchmark & burn-in suite
 
 Group:          Applications/System
 License:        GPLv2
 URL:            http://www.coker.com.au/bonnie++/
-Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz
+Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz
+Patch0:         bonnie++-1.03e-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Patch1:         bonnie++-1.03a-gcc43.patch
 
 %description
 bonnie++ filesystem and disk benchmark suite aggressively reads & writes
@@ -22,18 +22,19 @@ Do not leave bonnie++ installed on a production system.  Use only while you
 test servers.
 
 %prep
-%setup -q -n bonnie++-1.03c
-%patch1 -p1
+%setup -q -n bonnie++-1.03e
+%patch0 -p1
 sed -i 's|${INSTALL}\s\+-s\b|${INSTALL}|' Makefile
 
 
 %build
-make %{?_smp_mflags} MORECFLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -43,10 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc readme.html copyright.txt credits.txt debian/changelog
-%{_mandir}/man1/bon_csv2html.1.gz
-%{_mandir}/man1/bon_csv2txt.1.gz
-%{_mandir}/man8/bonnie++.8.gz
-%{_mandir}/man8/zcav.8.gz
+%{_mandir}/man1/bon_csv2html.1*
+%{_mandir}/man1/bon_csv2txt.1*
+%{_mandir}/man8/bonnie++.8*
+%{_mandir}/man8/zcav.8*
 %{_sbindir}/bonnie++
 %{_sbindir}/zcav
 %{_bindir}/bon_csv2html
@@ -54,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 13 2009 Steven Pritchard <steve@kspei.com> 1.03e-1
+- Update to 1.03e
+- Drop gcc43 patch (upstream has a fix)
+- Use configure and patch Makefile to install correctly
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.03c-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 9aec9d7..391f09e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77a1ba78f37bdd7f024b67e1e36ad151  bonnie++-1.03c.tgz
+750aa5b5051263a99c6c195888c74968  bonnie++-1.03e.tgz