diff --git a/hplip.spec b/hplip.spec
index e85f877..6bf52df 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -6,6 +6,7 @@ License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Obsoletes: hpoj <= 0.91
 Obsoletes: xojpanel <= 0.91
+Conflicts: system-config-printer < 0.6.132
 
 # This is needed for upgrades, but we don't package devel files yet.
 Obsoletes: hpoj-devel <= 0.91
@@ -138,6 +139,10 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 fi
 
 %changelog
+* Mon Jun 13 2005 Tim Waugh <twaugh@redhat.com>
+- Conflicts: system-config-printer < 0.6.132 (i.e. before HPLIP support
+  was added)
+
 * Thu Jun  9 2005 Tim Waugh <twaugh@redhat.com> 0.9.3-3
 - Added Obsoletes: for xojpanel and hpoj-devel (but we don't actually package
   devel files yet).