diff --git a/.cvsignore b/.cvsignore
index 09bdfa2..beaa7e1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -18,3 +18,4 @@ foomatic-db-hpijs-1.5-20050613.tar.gz
 foomatic-db-20050703.tar.gz
 foomatic-db-20050718.tar.gz
 foomatic-db-3.0-20050726.tar.gz
+foomatic-db-3.0-20050804.tar.gz
diff --git a/foomatic.spec b/foomatic.spec
index 594edf7..1c84599 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,4 +1,4 @@
-%define dbver 20050726
+%define dbver 20050804
 %define enginever 3.0.2
 %define filtersver 3.0.2
 %define hpijsver 1.5-20050613
@@ -39,9 +39,6 @@ Patch5: foomatic-2.0.2-fontpath.patch
 Patch6: foomatic-ppdload.patch
 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
 
@@ -85,6 +82,10 @@ BuildRequires: a2ps
 Conflicts: ghostscript < 7.05
 Conflicts: hpijs < 1.5
 
+# Some XM files have a <drivers> tag which confuses the older printconf
+# parser.
+Conflicts: system-config-printer < 0.6.139
+
 %description
 Foomatic is a comprehensive, spooler-independent database of printers,
 printer drivers, and driver descriptions. It contains utilities to
@@ -125,7 +126,6 @@ popd
 
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
-%patch8 -p1 -b .hplj5
 
 %if %with_omni
 # Omni printers
@@ -276,6 +276,11 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/*/*
 
 %changelog
+* Thu Aug  4 2005 Tim Waugh <twaugh@redhat.com>
+- Updated db to 3.0-20050804.
+- No longer need hplj5 patch.
+- Conflicts with system-config-printer before the parser bug was fixed.
+
 * Tue Jul 26 2005 Tim Waugh <twaugh@redhat.com> 3.0.2-23
 - Updated db to 3.0-20050726.
 - No longer need ieee1284 patch.
diff --git a/sources b/sources
index a987650..b53d6f0 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ e5cac8f30f0c39b576c1a25008a06198  gimp-print-foomatic-db-4.2.7.tar.bz2
 f0f4c90fa0ae346f53bf19a165e071a6  foomatic-filters-3.0.2.tar.gz
 dcfbfbe16d76d0b6e44cb261fccd138f  Omni-printers-0.9.2.tar.bz2
 37c209488589a4a127b98e4a90aff051  foomatic-db-hpijs-1.5-20050613.tar.gz
-407f10c21344dee2066e80e6b99e3f08  foomatic-db-3.0-20050726.tar.gz
+6351181b4c2c8340e0997d85fb8cea6c  foomatic-db-3.0-20050804.tar.gz