diff --git a/.cvsignore b/.cvsignore
index f40a1f9..8b57bba 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,6 @@
-Omni-printers-0.9.0.tar.bz2
+Omni-printers-0.9.1.tar.bz2
 foomatic-db-20040112.tar.gz
-foomatic-db-engine-3.0.1rc2.tar.gz
+foomatic-db-engine-3.0-20031217.tar.gz
 foomatic-db-hpijs-1.5-20031217.tar.gz
-foomatic-filters-3.0.1rc3.tar.gz
+foomatic-filters-3.0-20031217.tar.gz
 gimp-print-foomatic-db-4.2.6.tar.bz2
diff --git a/foomatic.spec b/foomatic.spec
index f6b7ab2..2e3727f 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,12 +1,11 @@
 %define dbver 20040112
-%define enginever 3.0.1rc2
-%define filtersver 3.0.1rc3
+%define enginever 3.0-20031217
 %define hpijsver 1.5-20031217
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.0
-Release: 21.3
+Release: 22
 License:	GPL
 Group: System Environment/Libraries
 
@@ -16,12 +15,12 @@ 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-%{filtersver}.tar.gz
+Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{enginever}.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
 
 # Build Omni first to get this (you'll have to create the tarball by hand):
-Source4: Omni-printers-0.9.0.tar.bz2
+Source4: Omni-printers-0.9.1.tar.bz2
 
 # The foomatic-db info from gimp-print (--with-ijs --with-foomatic)
 Source5: gimp-print-foomatic-db-4.2.6.tar.bz2
@@ -40,15 +39,12 @@ Patch7: foomatic-ppdload-ppd.patch
 # Allow pxlmono for HP LaserJet 5
 Patch8: foomatic-hplj5.patch
 
-# Don't break gimp-print driver
-Patch9: foomatic-printoutmode.patch
+# Use relative symlinks.
+Patch9: foomatic-db-engine-symlink.patch
 
 # Make foomatic-ppdfile accept '-t type' like foomatic-datafile used to.
 Patch10: foomatic-db-engine-compat.patch
 
-# Fix up HP Color Inkjet CP1700 support.
-Patch11: foomatic-db-hpijs-hpijs15.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -87,7 +83,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-%{filtersver}
+pushd foomatic-filters-%{enginever}
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
 ./make_configure
@@ -97,14 +93,11 @@ 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
 ./make_configure
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-%patch11 -p1 -b .hpijs15
-popd
-
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 %patch8 -p1 -b .hplj5
@@ -119,13 +112,11 @@ 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-%{filtersver}
+pushd foomatic-filters-%{enginever}
 %configure
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
@@ -148,7 +139,7 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd foomatic-filters-%{filtersver}
+pushd foomatic-filters-%{enginever}
 eval `perl '-V:installvendorlib' '-V:installvendorarch'`
 mkdir -p $RPM_BUILD_ROOT/$installvendorlib
 export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib
@@ -248,18 +239,8 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/*/*
 
 %changelog
-* Mon Feb  9 2004 Tim Waugh <twaugh@redhat.com> 3.0.0-21.3
-- Fix up HP Color Inkjet CP1700 support.
-
-* Mon Jan 26 2004 Tim Waugh <twaugh@redhat.com> 3.0.0-21.2
-- Remove PrintoutMode option from gimp-print driver to avoid breaking it.
-- Upgrade filters to 3.0.1rc3.
-- Upgrade engine to 3.0.1rc2.
-- No longer need symlink patch.
-
-* Mon Jan 19 2004 Tim Waugh <twaugh@redhat.com> 3.0.0-21.1
-- Build for Fedora Core 1 printer drivers update.
-- Downgrade filters back down to 3.0.0.
+* Mon Jan 12 2004 Tim Waugh <twaugh@redhat.com> 3.0.0-22
+- Updated Omni printers to 0.9.1 again.
 
 * Mon Jan 12 2004 Tim Waugh <twaugh@redhat.com> 3.0.0-21
 - Build for Fedora Core 1 printer drivers update.
diff --git a/sources b/sources
index d8ea8f5..38f9bfa 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-0185122c75ff716a0834f5a16c3692fd  Omni-printers-0.9.0.tar.bz2
+2422ebfd69519b2d1822fba4c76bbb30  Omni-printers-0.9.1.tar.bz2
 0bdddcd2a8d188a49312d6a83e9d2cb7  foomatic-db-20040112.tar.gz
-866fb29353df43dff019ef1033a05b41  foomatic-db-engine-3.0.1rc2.tar.gz
+deb8a7c4d97593b1767ecc99dab63584  foomatic-db-engine-3.0-20031217.tar.gz
 118783f0dd57de92f93b3715a7fa38f7  foomatic-db-hpijs-1.5-20031217.tar.gz
-6df5bbf9066aba767da53827ffd82e1d  foomatic-filters-3.0.1rc3.tar.gz
+66d1cfa57bdd39241ebf024457508468  foomatic-filters-3.0-20031217.tar.gz
 7be2492cf281c300f0ac843ad65e5419  gimp-print-foomatic-db-4.2.6.tar.bz2