diff --git a/.cvsignore b/.cvsignore
index ffdb636..d6cdf98 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pentaho-reporting-flow-engine-0.9.3.tar.gz
+flow-engine-0.9.2-OOo31.zip
diff --git a/pentaho-reporting-flow-engine-0.9.3-depends.patch b/pentaho-reporting-flow-engine-0.9.3-depends.patch
deleted file mode 100644
index 8de22fd..0000000
--- a/pentaho-reporting-flow-engine-0.9.3-depends.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- pentaho-reporting-flow-engine-0.9.3.orig/build.properties	2008-05-07 17:15:09.000000000 +0100
-+++ pentaho-reporting-flow-engine-0.9.3/build.properties	2008-05-07 17:15:02.000000000 +0100
-@@ -40,17 +40,17 @@
- #  Used libraries ...
- 
- # Used by: core libraries
--jcommon-jar-file=jcommon-1.0.10.jar
--jcommon-serializer-jar-file=jcommon-serializer-0.1.0.jar
--libfonts-jar-file=libfonts-0.3.3.jar
--libfonts-core-jar-file=libfonts-0.3.3.jar
--libfonts-itext-jar-file=libfonts-0.3.3.jar
--liblayout-jar-file=liblayout-0.2.9.jar
--libloader-jar-file=libloader-0.3.6.jar
--libxml-jar-file=libxml-0.9.9.jar
--libformula-jar-file=libformula-0.1.14.jar
--librepository-jar-file=librepository-0.1.4.jar
--flute-jar-file=flute-1.3-jfree-20061107.jar
-+jcommon-jar-file=jcommon.jar
-+jcommon-serializer-jar-file=jcommon-serializer.jar
-+libfonts-jar-file=libfonts.jar
-+libfonts-core-jar-file=libfonts.jar
-+libfonts-itext-jar-file=libfonts.jar
-+liblayout-jar-file=liblayout.jar
-+libloader-jar-file=libloader.jar
-+libxml-jar-file=libxml.jar
-+libformula-jar-file=libformula.jar
-+librepository-jar-file=librepository.jar
-+flute-jar-file=flute.jar
- 
- #
- # Optional libraries
-@@ -59,7 +59,7 @@
- oscache-jar-file=optional/oscache-2.3-compat.jar
- 
- # Used by: module-parser
--jaxp-jar-file=gnujaxp.jar
-+jaxp-jar-file=jaxp.jar
- sac-jar-file=sac.jar
- 
- # Used by: output-pdf
diff --git a/pentaho-reporting-flow-engine.spec b/pentaho-reporting-flow-engine.spec
index b61f96b..66d42e9 100644
--- a/pentaho-reporting-flow-engine.spec
+++ b/pentaho-reporting-flow-engine.spec
@@ -2,18 +2,19 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: pentaho-reporting-flow-engine
-Version: 0.9.3
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 Summary: Pentaho Flow Reporting Engine
 License: LGPLv2+
+Epoch: 1
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/jfreereport/flow-engine-%{version}-OOo31.zip
 URL: http://reporting.pentaho.org/
-BuildRequires: ant, java-devel, jpackage-utils, jcommon, jcommon-serializer
+BuildRequires: ant, java-devel, jpackage-utils, libbase
 BuildRequires: libloader, libfonts, pentaho-libxml, xml-commons-apis
 BuildRequires: librepository, sac, flute, liblayout, libformula
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, jcommon, jcommon-serializer, libfonts >= 0.3.4
+Requires: java, jpackage-utils, libbase >= 1.0.0, libfonts >= 0.3.4
 Requires: pentaho-libxml, libformula >= 0.1.18, librepository >= 0.1.6
 Requires: sac, flute, liblayout >= 0.2.9
 %if %{with_gcj}
@@ -23,7 +24,6 @@ Requires(postun): java-gcj-compat >= 1.0.31
 %else
 BuildArch: noarch
 %endif
-Patch1: pentaho-reporting-flow-engine-0.9.3-depends.patch
 
 %description
 Pentaho Reporting Flow Engine is a free Java report library, formerly
@@ -39,23 +39,24 @@ Requires: jpackage-utils
 Javadoc for %{name}.
 
 %prep
-%setup -q
-%patch1 -p1 -b .depends
+%setup -q -c
+mkdir -p lib
 find . -name "*.jar" -exec rm -f {} \;
-build-jar-repository -s -p lib jcommon jcommon-serializer libloader libfonts \
-    libxml jaxp libformula librepository sac flute liblayout
+build-jar-repository -s -p lib commons-logging-api libbase libloader \
+    libfonts libxml jaxp libformula librepository sac flute liblayout \
+    libserializer
 
 %build
-ant compile javadoc
+ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p build/lib/flow-engine.jar $RPM_BUILD_ROOT%{_javadir}/flow-engine.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -92,6 +93,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Mar 16 2009 Caolan McNamara <caolanm@redhat.com> 0.9.2-1
+- OOo tuned version
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 35576c7..ae92042 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-247d05bdb543043a1c58ba7763c55bb5  pentaho-reporting-flow-engine-0.9.3.tar.gz
+4121d73be1d53746b78d6fd2ae440b6b  flow-engine-0.9.2-OOo31.zip