diff --git a/.cvsignore b/.cvsignore
index 4d7ec7e..c804b92 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -77,3 +77,4 @@ foomatic-filters-4.0.2.tar.gz
 foomatic-db-engine-4.0.2.tar.gz
 foomatic-db-hpijs-20090701.tar.gz
 foomatic-db-4.0-20090702.tar.gz
+foomatic-db-4.0-20090819.tar.gz
diff --git a/foomatic-epson-stylus-color-200.patch b/foomatic-epson-stylus-color-200.patch
deleted file mode 100644
index 53323ff..0000000
--- a/foomatic-epson-stylus-color-200.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/driver/stcolor.xml
---- foomatic-db-20090702/db/source/driver/stcolor.xml.epson-stylus-color-200	2009-07-02 08:49:20.000000000 +0100
-+++ foomatic-db-20090702/db/source/driver/stcolor.xml	2009-08-04 16:08:19.378201381 +0100
-@@ -22,6 +22,9 @@ better dithering. Try it.</en>
-    <id>printer/Epson-Stylus_Color</id><!-- Epson Stylus Color -->
-   </printer>
-   <printer>
-+   <id>printer/Epson-Stylus_Color_200</id><!-- Epson Stylus Color 200 -->
-+  </printer>
-+  <printer>
-    <id>printer/Epson-Stylus_Color_300</id><!-- Epson Stylus Color 300 -->
-    <comments>
-     <en>Works with the "-dMicroweave" option.</en>
-diff -up foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200 foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml
---- foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml.epson-stylus-color-200	2009-07-02 08:49:23.000000000 +0100
-+++ foomatic-db-20090702/db/source/printer/Epson-Stylus_Color_200.xml	2009-08-04 16:08:19.382201394 +0100
-@@ -19,7 +19,7 @@
-   <autodetect></autodetect>
-   <functionality>B</functionality>
-   <!--not "unverified"-->
--  <driver>mj500c</driver>
-+  <driver>stcolor</driver>
-   <comments>
-     <en>Imported from old Red Hat japanese printer database</en>
-     </comments>
diff --git a/foomatic.spec b/foomatic.spec
index d63bacb..0d5d383 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,13 +1,12 @@
 %define dbver_rel 4.0
-%define dbver_snap 20090702
+%define dbver_snap 20090819
 %define enginever 4.0.2
 %define filtersver 4.0.2
-%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	%{enginever}
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -19,7 +18,6 @@ Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{engi
 
 Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
-Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 ## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
 
@@ -40,7 +38,6 @@ Patch102: foomatic-bad-utf8.patch
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 ## PATCHES FOR FOOMATIC-DB (PATCHES 301 TO 400)
-Patch301: foomatic-epson-stylus-color-200.patch
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -85,7 +82,7 @@ queues (foomatic-configure) and to print files/manipulate jobs
 The site http://www.linuxprinting.org/ is based on this database.
 
 %prep
-%setup -q -c -a 1 -a 2 -a 3
+%setup -q -c -a 1 -a 2
 
 pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
@@ -98,12 +95,7 @@ chmod a+x mkinstalldirs
 %patch102 -p1
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-popd
-
 pushd foomatic-db-%{dbver_snap}
-%patch301 -p1 -b .epson-stylus-color-200
-
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -150,11 +142,6 @@ pushd foomatic-db-%{dbver_snap}
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-%configure
-make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -184,13 +171,6 @@ make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 
 popd
 
-pushd foomatic-db-hpijs-%{hpijsver}
-make	DESTDIR=%buildroot PREFIX=%{_prefix} \
-	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
-	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
-	install
-popd
-
 # Remove ghostscript UPP drivers that are gone in 7.07
 rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
 
@@ -248,6 +228,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Aug 21 2009 Tim Waugh <twaugh@redhat.com> 4.0.2-6
+- Updated to foomatic-db-4.0-20090819.  Removed db-hpijs.
+
 * Thu Aug 20 2009 Tim Waugh <twaugh@redhat.com> 4.0.2-5
 - Removed references to foo2slx and foo2hiperc (bug #518267).
 - Use stcolor driver for Epson Stylus Color 200 (bug #513676).
diff --git a/sources b/sources
index 243f8cf..335c28b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 9d3a938be1c9ea00add9c7c467653861  foomatic-filters-4.0.2.tar.gz
 8595d59be013482e4dd2834adf11f55a  foomatic-db-engine-4.0.2.tar.gz
-2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
-df252272fd8f802c57650bbc059a0f42  foomatic-db-4.0-20090702.tar.gz
+b48520c72a3690b35bb93585fd2e632a  foomatic-db-4.0-20090819.tar.gz