diff --git a/.cvsignore b/.cvsignore
index 721d677..4dc60e4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 Omni-printers.tar.bz2
-foomatic-20011018.tar.bz2
+foomatic-1.1-20011218.tar.bz2
diff --git a/foomatic.spec b/foomatic.spec
index d24fd4e..3da9e81 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,15 +1,24 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	1.1
-%define release_date 20011018
-Release:	0.%{release_date}.8a
+%define release_date 20011218
+%define sub_release 3
+Release:	0.%{release_date}.%{sub_release}
 License:	GPL
 Group: System Environment/Libraries
 
-Source:		foomatic-%{release_date}.tar.bz2
+# Generated by:
+# NOW=`date '+%Y%m%d'`
+# cvs -z6 -d :pserver:anonymous@cvs.linuxprinting.org:/usr/local/cvs export -D now foomatic
+# tar cjf foomatic-1.1-$NOW.tar.bz2 foomatic
+Source:		foomatic-1.1-%{release_date}.tar.bz2
 Source1:	Omni-printers.tar.bz2
-Patch1:		foomatic-prepend_scanner.patch
-Patch2:		foomatic-use_utf8.patch
+
+Patch0:	foomatic-1.1-20011218-prepend.patch
+Patch1:	foomatic-1.1-20011218-utf8.patch
+Patch2: foomatic-1.1-20011218-lpdomatic.patch
+Patch3: foomatic-1.1-20011218-fd3.patch
+Patch4: foomatic-1.1-20020131-sys.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl
@@ -19,10 +28,8 @@ Requires:	perl-Storable >= 0.6.11, perl-DateManip >= 5.39, perl-libxml-enno >= 1
 Requires:	perl-libxml-perl >= 0.07, perl-Parse-Yapp >= 1.04, perl-XML-Dumper >= 0.4
 Requires:	perl-XML-Encoding >= 1.01, perl-XML-Parser >= 2.29, perl-XML-Twig >= 2.02
 Requires:	perl-XML-Grove, perl-libwww-perl
-# For the 'rm' in post
-Requires: fileutils
-# for /sbin/service
-Requires: initscripts
+# For 'rm' and '/sbin/service' in post
+PreReq: fileutils initscripts
 BuildRequires:	perl-Storable >= 0.6.11, perl-DateManip >= 5.39, perl-libxml-enno >= 1.02
 BuildRequires:	perl-libxml-perl >= 0.07, perl-Parse-Yapp >= 1.04, perl-XML-Dumper >= 0.4
 BuildRequires:	perl-XML-Encoding >= 1.01, perl-XML-Parser >= 2.29, perl-XML-Twig >= 2.02
@@ -43,10 +50,17 @@ queues (foomatic-configure) and to print files/manipulate jobs
 The site http://www.linuxprinting.org/ is based in this database.
 
 %prep
-
 %setup -q -n foomatic
-%patch1 -p1 -b .prepend_scanner
-%patch2 -p1 -b .use_utf8
+# Fix prepends in lpdomatic (bug #57371)
+%patch0 -p1 -b .prepend
+# Fix PCL fixup code (bug #55909, others)
+%patch1 -p1
+# Put lpdomatic in /usr/sbin again.
+%patch2 -p1 -b .lpdomatic
+# Fix foomatic-gswrapper's file descriptor manipulations (bug #43619).
+%patch3 -p1 -b .fd3
+# Fix a thinko in DB.pl.
+%patch4 -p1
 
 tar xjf %{SOURCE1}
 
@@ -64,6 +78,9 @@ make	PREFIX=%{_prefix} \
 	INSTALLSITELIB=$RPM_BUILD_ROOT/$installsitelib \
 	install
 
+# Remove drivers with no command line.
+./foomatic-cleanupdrivers $RPM_BUILD_ROOT/usr/share/foomatic
+
 # Install printers from the Omni project, if there isn't already an entry
 cd Omni-printers;
 P_DIR=$RPM_BUILD_ROOT/usr/share/foomatic/db/source/printer
@@ -107,6 +124,36 @@ rm -fr %buildroot
 %_datadir/*
 
 %changelog
+* Tue Feb  5 2002 Tim Waugh <twaugh@redhat.com> 1.1-0.20011218.3
+- Fix a thinko in DB.pl.
+
+* Fri Jan 18 2002 Tim Waugh <twaugh@redhat.com> 1.1-0.20011218.2
+- REALLY fix PCL fixup code (bug #55909, others).
+- PreReq fileutils, initscripts (bug #56984).
+- Fix prepends in lpdomatic (bug #57371).
+- Run foomatic-cleanupdrivers during install, to remove driver entries
+  with no command line.
+- Put lpdomatic in /usr/sbin again.
+- Fix foomatic-gswrapper's file descriptor manipulations (bug #56871).
+
+* Mon Dec 17 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011218.1
+- re-imported from upstream to fix some perl fixup code on pcl printers.
+
+* Mon Dec 17 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011217.2
+- fix the rest of the quoting issues with foomatic-combo-xml with the patch
+- foomatic-1.1-20011217-quotes.patch. This has been sent upstream.
+
+* Mon Dec 17 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011217.1
+- respin to pull in latest foomatic database, fixes:
+-	properly use the cache in relation to foomatic-combo-xml's output
+-	fix _some_ of the quoting issues with calling foomatic-combo-xml
+
+* Thu Dec  5 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011205.1
+- respin to pull in latest foomatic database, fixes:
+-	droping half of a large job
+-	-Mutf8 added to the upstream filters
+-	miscelaneous printer db updates
+
 * Mon Nov 29 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011018.8
 - added Requires: fileutils for the 'rm' in post
 
diff --git a/sources b/sources
index 1205144..d380d57 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 405917d212860f14c7b8bf38a53a07fd  Omni-printers.tar.bz2
-214db1007fa3823839ca343cb55614af  foomatic-20011018.tar.bz2
+fa10a0d6124401d0003f67db97268d7d  foomatic-1.1-20011218.tar.bz2