diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index d82eed21b10..e7b5442b78b 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/08/22 06:57:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/08/24 16:33:26 ajacoutot Exp $
 
 PKG_ARCH=		*
 
@@ -9,6 +9,8 @@ DISTNAME=		foomatic-db-4.0-${V}
 PKGNAME=		foomatic-db-4.0.${V}
 CATEGORIES=		print
 
+REVISION=		0
+
 HOMEPAGE=		http://www.linux-foundation.org/en/OpenPrinting/Database/Foomatic
 
 MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
@@ -48,5 +50,11 @@ pre-configure:
 	mv ${WRKSRC}/db/source/printer/${i}.xml \
 		${WRKSRC}/db/source/printer/${i}-splix.xml
 .endfor
+# We do not ship gutenprint (cups), but gutenprint-ijs.${MAJOR_V} that
+# is spooler independant, so don't display it as an valid driver --
+# MAJOR_V is set in the gutenprint port.
+	rm ${WRKSRC}/db/source/driver/gutenprint.xml
+	find ${WRKSRC}/db/source/printer -name '*.xml' | xargs grep -l "<driver>gutenprint" | \
+		xargs perl -pi -e 's,<driver>gutenprint</driver>,<driver>gutenprint-ijs.5.2</driver>,g'
 
 .include <bsd.port.mk>
diff --git a/print/foomatic-db/pkg/PLIST b/print/foomatic-db/pkg/PLIST
index fccf7f58c2b..663bde66f3b 100644
--- a/print/foomatic-db/pkg/PLIST
+++ b/print/foomatic-db/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2010/08/22 06:57:38 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2010/08/24 16:33:26 ajacoutot Exp $
 share/foomatic/db/
 share/foomatic/db/oldprinterids
 share/foomatic/db/source/
@@ -2534,7 +2534,6 @@ share/foomatic/db/source/driver/escpage.xml
 share/foomatic/db/source/driver/fmlbp.xml
 share/foomatic/db/source/driver/fmpr.xml
 share/foomatic/db/source/driver/gdi.xml
-share/foomatic/db/source/driver/gutenprint.xml
 share/foomatic/db/source/driver/hl1250.xml
 share/foomatic/db/source/driver/hl7x0.xml
 share/foomatic/db/source/driver/hpijs-pcl3.xml