diff --git a/.cvsignore b/.cvsignore
index 8b57bba..48021ce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,6 @@
 Omni-printers-0.9.1.tar.bz2
-foomatic-db-20040112.tar.gz
-foomatic-db-engine-3.0-20031217.tar.gz
-foomatic-db-hpijs-1.5-20031217.tar.gz
-foomatic-filters-3.0-20031217.tar.gz
+foomatic-db-20040219.tar.gz
+foomatic-db-engine-3.0.1.tar.gz
+foomatic-db-hpijs-1.5-20040219.tar.gz
+foomatic-filters-3.0.1.tar.gz
 gimp-print-foomatic-db-4.2.6.tar.bz2
diff --git a/foomatic.spec b/foomatic.spec
index 2e3727f..2bb8fa7 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,11 +1,12 @@
-%define dbver 20040112
-%define enginever 3.0-20031217
-%define hpijsver 1.5-20031217
+%define dbver 20040219
+%define enginever 3.0.1
+%define filtersver 3.0.1
+%define hpijsver 1.5-20040219
 
 Summary: Foomatic printer database.
 Name:		foomatic
-Version:	3.0.0
-Release: 22
+Version:	3.0.1
+Release: 2
 License:	GPL
 Group: System Environment/Libraries
 
@@ -15,7 +16,7 @@ Group: System Environment/Libraries
 # tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic
 Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
 
-Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{enginever}.tar.gz
+Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver}.tar.gz
 Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
@@ -39,11 +40,11 @@ Patch7: foomatic-ppdload-ppd.patch
 # Allow pxlmono for HP LaserJet 5
 Patch8: foomatic-hplj5.patch
 
-# Use relative symlinks.
-Patch9: foomatic-db-engine-symlink.patch
+# Don't break gimp-print driver
+Patch9: foomatic-printoutmode.patch
 
-# Make foomatic-ppdfile accept '-t type' like foomatic-datafile used to.
-Patch10: foomatic-db-engine-compat.patch
+# Fix Omni PageSize problem (bug #115586).
+Patch10: foomatic-db-engine-db-pm-omni-0.9.1.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -83,7 +84,7 @@ The site http://www.linuxprinting.org/ is based on this database.
 %prep
 %setup -q -c -a 1 -a 2 -a 3
 
-pushd foomatic-filters-%{enginever}
+pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
 ./make_configure
@@ -93,11 +94,13 @@ pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
 %patch6 -p1 -b .ppdload
-%patch9 -p1 -b .symlink
-%patch10 -p1 -b .compat
+%patch10 -p1 -b .db-pm-omni-0.9.1
 ./make_configure
 popd
 
+pushd foomatic-db-hpijs-%{hpijsver}
+popd
+
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 %patch8 -p1 -b .hplj5
@@ -112,11 +115,13 @@ tar xjf %{SOURCE5}
 # Fix up 'gimp-print' references to point to 'gimp-print-ijs'.
 perl -pi -e 's,>gimp-print<,>gimp-print-ijs<,' printer/*.xml
 popd
+rm -f db/source/opt/gimp-print-printoutmode.xml
+%patch9 -p1 -b .printoutmode
 
 popd
 
 %build
-pushd foomatic-filters-%{enginever}
+pushd foomatic-filters-%{filtersver}
 %configure
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
@@ -139,7 +144,7 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd foomatic-filters-%{enginever}
+pushd foomatic-filters-%{filtersver}
 eval `perl '-V:installvendorlib' '-V:installvendorarch'`
 mkdir -p $RPM_BUILD_ROOT/$installvendorlib
 export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib
@@ -239,6 +244,28 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/*/*
 
 %changelog
+* Thu Mar  4 2004 Tim Waugh <twaugh@redhat.com> 3.0.1-2
+- Fix Omni PageSize problem (bug #115586).
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Feb 19 2004 Tim Waugh <twaugh@redhat.com> 3.0.1-1
+- Upgrade db to 20040219.
+- Upgrade hpijs to 1.5-20040219.
+- Upgrade engine to 3.0.1.
+- Upgrade filters to 3.0.1.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Feb  9 2004 Tim Waugh <twaugh@redhat.com> 3.0.0-23
+- Fix up HP Color Inkjet CP1700 support.
+- Remove PrintoutMode option from gimp-print driver to avoid breaking it.
+- Update filters to 3.0.1rc3.
+- Update engine to 3.0.1rc2
+- No long need symlink patch.
+
 * Mon Jan 12 2004 Tim Waugh <twaugh@redhat.com> 3.0.0-22
 - Updated Omni printers to 0.9.1 again.
 
diff --git a/sources b/sources
index 38f9bfa..20b184e 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 2422ebfd69519b2d1822fba4c76bbb30  Omni-printers-0.9.1.tar.bz2
-0bdddcd2a8d188a49312d6a83e9d2cb7  foomatic-db-20040112.tar.gz
-deb8a7c4d97593b1767ecc99dab63584  foomatic-db-engine-3.0-20031217.tar.gz
-118783f0dd57de92f93b3715a7fa38f7  foomatic-db-hpijs-1.5-20031217.tar.gz
-66d1cfa57bdd39241ebf024457508468  foomatic-filters-3.0-20031217.tar.gz
+9562adfc001953390fb2103ceb84e0f0  foomatic-db-20040219.tar.gz
+89070d0acc245d350faeb0c49a5f3f7f  foomatic-db-engine-3.0.1.tar.gz
+a968196fd540be53200220a785c2c518  foomatic-db-hpijs-1.5-20040219.tar.gz
+afa2bfcee2661252ec56af5616017d1e  foomatic-filters-3.0.1.tar.gz
 7be2492cf281c300f0ac843ad65e5419  gimp-print-foomatic-db-4.2.6.tar.bz2