diff --git a/.cvsignore b/.cvsignore
index 1625bc6..721d677 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-foomatic-20010905.tar.bz2
+Omni-printers.tar.bz2
+foomatic-20011018.tar.bz2
diff --git a/foomatic.spec b/foomatic.spec
index 318c1c7..8542b93 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,12 +1,15 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	1.1
-%define release_date 20010905
-Release:	0.%{release_date}.1
+%define release_date 20011018
+Release:	0.%{release_date}.6
 License:	GPL
 Group: System Environment/Libraries
 
 Source:		foomatic-%{release_date}.tar.bz2
+Source1:	Omni-printers.tar.bz2
+Patch1:		foomatic-prepend_scanner.patch
+Patch2:		foomatic-use_utf8.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl
@@ -38,6 +41,10 @@ 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
+
+tar xjf %{SOURCE1}
 
 %build
 make PREFIX=%{_prefix} INSTALLPREFIX=%buildroot
@@ -53,6 +60,34 @@ make	PREFIX=%{_prefix} \
 	INSTALLSITELIB=$RPM_BUILD_ROOT/$installsitelib \
 	install
 
+# 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
+for P in *.xml; do
+	if [ ! -f $P_DIR/$P ]; then
+		cp $P $P_DIR;
+	fi;
+done;
+cd ..
+
+mkdir -p $RPM_BUILD_ROOT/var/cache/foomatic/{pcache,compiled}
+
+%post
+# zap the cache
+rm -rf /var/chache/foomatic/{pcache,compiled}/*
+
+# Try to rebuild the printconf data
+if [ -x /usr/sbin/printconf-backend ] ; then
+   /usr/sbin/printconf-backend --force-rebuild > /dev/null 2> /dev/null
+fi
+
+# restart the print server if it is running now
+if /sbin/service lpd status 2>&1 > /dev/null ; then
+   /sbin/service lpd restart 2>&1 > /dev/null
+fi
+
+exit 0
+
 %clean
 rm -fr %buildroot
 
@@ -68,6 +103,33 @@ rm -fr %buildroot
 %_datadir/*
 
 %changelog
+* Fri Nov 16 2001 Nalin Dahyabhai <nalin@redhat.com> 1.1-0.20011018.6
+- fix %%post scriptlet
+
+* Tue Nov 13 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011018.5
+- changed the patch to use the -Mutf8 command line option,
+- and to restart the printserver, after rebuilding the settings.
+
+* Fri Nov  9 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011018.4
+- grumble. Some drivers use inline perl scripts, and need the 'use utf8;'
+- pragma. Without it, they break on _some_ of their options.
+
+* Wed Oct 31 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011018.3
+- patched lpdomatic to prepend PostScript options in the _right_ place.
+
+* Thu Oct 25 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011018.2
+- zap the foomatic cache on install
+
+* Thu Oct 18 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011018.1
+- rolled to pull in latest information.
+- added Omni printers to the printer list.
+
+* Fri Oct 05 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011005.1
+- rolled to pull in an ia64 fix to foomatic-combo-xml.c
+
+* Mon Oct 01 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20011001.1
+- rolled to pull in foomatic fixes to foomatic-combo-xml.c
+
 * Wed Sep 05 2001 Crutcher Dunnavant <crutcher@redhat.com> 1.1-0.20010905.1
 - upgraded to latest foomatic, we now have fast overview generation!
 - this means that there is no prebuilt overview file.
diff --git a/sources b/sources
index 331297c..1205144 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-1b72f987b70e1fd82d6d67e19a715790  foomatic-20010905.tar.bz2
+405917d212860f14c7b8bf38a53a07fd  Omni-printers.tar.bz2
+214db1007fa3823839ca343cb55614af  foomatic-20011018.tar.bz2