diff --git a/.cvsignore b/.cvsignore
index 84bdc54..3aece5d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bonnie++-1.03e.tgz
+bonnie++-1.96.tgz
diff --git a/bonnie++-1.03e-makefile.patch b/bonnie++-1.03e-makefile.patch
deleted file mode 100644
index 9f6bfd5..0000000
--- a/bonnie++-1.03e-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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++-1.96-makefile.patch b/bonnie++-1.96-makefile.patch
new file mode 100644
index 0000000..793db1e
--- /dev/null
+++ b/bonnie++-1.96-makefile.patch
@@ -0,0 +1,34 @@
+--- bonnie++-1.96.orig/Makefile.in	2009-12-09 10:01:09.000000000 -0500
++++ bonnie++-1.96/Makefile.in	2009-12-09 10:02:33.000000000 -0500
+@@ -17,6 +17,8 @@ THREAD_LFLAGS=@thread_ldflags@
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ 
++DESTDIR=
++
+ BONSRC=bonnie++.cpp bon_io.cpp bon_file.cpp bon_time.cpp semaphore.cpp \
+  sync.cpp thread.cpp bon_suid.cpp duration.cpp rand.o util.o
+ BONOBJS=$(BONSRC:.cpp=.o)
+@@ -52,15 +54,15 @@ generate_randfile: generate_randfile.o
+ 	$(LINK) generate_randfile.o -o generate_randfile
+ 
+ install-bin: $(EXE) $(EXES)
+-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
+-	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
+-	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin
+-	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
++	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
++	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
++	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin
++	@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
+ 	$(CXX) -c $<
diff --git a/bonnie++.spec b/bonnie++.spec
index ab83818..36e7880 100644
--- a/bonnie++.spec
+++ b/bonnie++.spec
@@ -1,14 +1,14 @@
 Name:           bonnie++
-Version:        1.03e
-Release:        3%{?dist}
+Version:        1.96
+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.03e.tgz
-Patch0:         bonnie++-1.03e-makefile.patch
+Source0:        http://www.coker.com.au/bonnie++/experimental/bonnie++-%{version}.tgz
+Patch0:         %{name}-%{version}-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 %description
@@ -22,7 +22,7 @@ Do not leave bonnie++ installed on a production system.  Use only while you
 test servers.
 
 %prep
-%setup -q -n bonnie++-1.03e
+%setup -q -n bonnie++-%{version}
 %patch0 -p1
 
 
@@ -45,15 +45,24 @@ rm -rf $RPM_BUILD_ROOT
 %doc readme.html copyright.txt credits.txt debian/changelog
 %{_mandir}/man1/bon_csv2html.1*
 %{_mandir}/man1/bon_csv2txt.1*
+%{_mandir}/man1/generate_randfile.1*
 %{_mandir}/man8/bonnie++.8*
+%{_mandir}/man8/getc_putc.8.*
 %{_mandir}/man8/zcav.8*
 %{_sbindir}/bonnie++
+%{_sbindir}/getc_putc
+%{_sbindir}/getc_putc_helper
 %{_sbindir}/zcav
 %{_bindir}/bon_csv2html
 %{_bindir}/bon_csv2txt
+%{_bindir}/generate_randfile
 
 
 %changelog
+* Wed Dec  9 2009 Rob Myers <rmyers@fedoraproject.org> - 1.96
+- Update to experimental version (#490895)
+- Merge patch from David Fetter
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.03e-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..579b755
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+bonnie++-1_96-1_fc13:HEAD:bonnie++-1.96-1.fc13.src.rpm:1260373813
diff --git a/sources b/sources
index 391f09e..b92c9c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-750aa5b5051263a99c6c195888c74968  bonnie++-1.03e.tgz
+7b8594559f00887d2865de1838328b35  bonnie++-1.96.tgz