diff --git a/print/cups/Makefile b/print/cups/Makefile
index aa454b6096b..0ccd4bdda9f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.50 2009/05/18 17:09:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.51 2009/05/19 11:15:28 ajacoutot Exp $
 
 COMMENT=		Common Unix Printing System
 
 VERSION=		1.3.10
 DISTNAME=		cups-${VERSION}-source
-PKGNAME=		cups-${VERSION}p4
+PKGNAME=		cups-${VERSION}p5
 CATEGORIES=		print sysutils
 
 SHARED_LIBS+=		cups		4.0
diff --git a/print/cups/patches/patch-cups_Makefile b/print/cups/patches/patch-cups_Makefile
index 3e7b06dea11..d9c3d581ce3 100644
--- a/print/cups/patches/patch-cups_Makefile
+++ b/print/cups/patches/patch-cups_Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-cups_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
+$OpenBSD: patch-cups_Makefile,v 1.5 2009/05/19 11:15:28 ajacoutot Exp $
 --- cups/Makefile.orig	Sat Sep  6 02:30:39 2008
-+++ cups/Makefile	Tue Mar 17 16:29:45 2009
++++ cups/Makefile	Tue May 19 12:50:40 2009
 @@ -131,7 +131,7 @@ all:	$(TARGETS)
  
  clean:
@@ -10,7 +10,7 @@ $OpenBSD: patch-cups_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
  	$(RM) -r 32bit 64bit
  
  
-@@ -156,9 +156,9 @@ depend:
+@@ -156,9 +156,8 @@ depend:
  install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
  	$(INSTALL_DIR) -m 755 $(LIBDIR)
  	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
@@ -19,11 +19,10 @@ $OpenBSD: patch-cups_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
 -		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
 +	if test $(LIBCUPS) = "libcups.so.${LIBcups_VERSION}" -o $(LIBCUPS) = "libcups.sl.${LIBcups_VERSION}"; then \
 +		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .${LIBcups_VERSION}`; \
-+		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .${LIBcups_VERSION}`; \
  	fi
  	if test $(LIBCUPS) = "libcups.2.dylib"; then \
  		$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
-@@ -185,13 +185,13 @@ installhdrs:
+@@ -185,13 +184,13 @@ installhdrs:
  
  install32bit:
  	$(INSTALL_DIR) -m 755 $(LIB32DIR)
@@ -41,7 +40,7 @@ $OpenBSD: patch-cups_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
  
  
  #
-@@ -206,7 +206,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
+@@ -206,7 +205,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
  	$(RM) $(LIBDIR)/libcups.sl
  	$(RM) $(LIBDIR)/libcups.sl.2
  	$(RM) $(LIBDIR)/libcups.so
@@ -50,7 +49,7 @@ $OpenBSD: patch-cups_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
  	-$(RMDIR) $(LIBDIR)
  	for file in $(HEADERS); do \
  		$(RM) $(INCLUDEDIR)/cups/$$file; \
-@@ -228,35 +228,35 @@ uninstall64bit:
+@@ -228,35 +227,35 @@ uninstall64bit:
  # libcups.so.2, libcups.sl.2
  #
  
diff --git a/print/cups/patches/patch-filter_Makefile b/print/cups/patches/patch-filter_Makefile
index b2ef51045cd..d75bebd914a 100644
--- a/print/cups/patches/patch-filter_Makefile
+++ b/print/cups/patches/patch-filter_Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
---- filter/Makefile.orig	Sat Sep  6 02:30:39 2008
-+++ filter/Makefile	Tue Mar 17 16:21:50 2009
+$OpenBSD: patch-filter_Makefile,v 1.6 2009/05/19 11:15:28 ajacoutot Exp $
+--- filter/Makefile.orig	Thu Mar 12 22:34:21 2009
++++ filter/Makefile	Tue May 19 12:49:32 2009
 @@ -57,7 +57,7 @@ all:	$(TARGETS)
  
  clean:
@@ -10,7 +10,7 @@ $OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
  	$(RM) -r 32bit 64bit
  
  
-@@ -88,9 +88,9 @@ install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32)
+@@ -88,9 +88,8 @@ install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32)
  	$(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo
  	$(INSTALL_DIR) -m 755 $(LIBDIR)
  	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
@@ -19,11 +19,10 @@ $OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
 -		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
 +	-if test $(LIBCUPSIMAGE) = "libcupsimage.so.${LIBcupsimage_VERSION}" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
 +		$(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .${LIBcupsimage_VERSION}`; \
-+		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .${LIBcupsimage_VERSION}`; \
  	fi
  	-if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
  		$(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
-@@ -116,13 +116,13 @@ installhdrs:
+@@ -116,13 +115,13 @@ installhdrs:
  
  install32bit:
  	$(INSTALL_DIR) -m 755 $(LIB32DIR)
@@ -41,7 +40,7 @@ $OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
  
  
  #
-@@ -143,7 +143,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
+@@ -143,7 +142,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
  	$(RM) $(LIBDIR)/libcupsimage.sl
  	$(RM) $(LIBDIR)/libcupsimage.sl.2
  	$(RM) $(LIBDIR)/libcupsimage.so
@@ -50,7 +49,7 @@ $OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
  	-$(RMDIR) $(LIBDIR)
  	$(RM) $(INCLUDEDIR)/cups/image.h
  	$(RM) $(INCLUDEDIR)/cups/raster.h
-@@ -151,12 +151,12 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
+@@ -151,12 +150,12 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
  
  uninstall32bit:
  	$(RM) $(LIB32DIR)/libcupsimage.so
@@ -65,7 +64,7 @@ $OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
  	-$(RMDIR) $(LIB64DIR)
  
  
-@@ -199,22 +199,22 @@ hpgltops:	$(HPGLOBJS) common.o ../cups/$(LIBCUPS)
+@@ -199,22 +198,22 @@ hpgltops:	$(HPGLOBJS) common.o ../cups/$(LIBCUPS)
  
  
  #
@@ -94,7 +93,7 @@ $OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
  	echo Linking 32-bit $@...
  	-mkdir 32bit
  	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
-@@ -222,10 +222,10 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
+@@ -222,10 +221,10 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
  
  
  #
diff --git a/print/cups/pkg/PFRAG.shared b/print/cups/pkg/PFRAG.shared
deleted file mode 100644
index 31fd6d5217b..00000000000
--- a/print/cups/pkg/PFRAG.shared
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 20:17:41 mbalmer Exp $
-@comment lib/libcups.so
-@lib lib/libcups.so.${LIBcups_VERSION}
-@comment lib/libcupsimage.so
-@lib lib/libcupsimage.so.${LIBcupsimage_VERSION}
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index 6e229ccc6ef..9710788ae0c 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.19 2009/05/08 20:00:57 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.20 2009/05/19 11:15:28 ajacoutot Exp $
 @conflict LPRng-*
 @newgroup _cups:541
 @newuser _cups:541:541:daemon:CUPS printer spooler daemon:/var/empty:/sbin/nologin
-%%SHARED%%
 @bin bin/cancel
 bin/cups-config
 @bin bin/cupstestdsc
@@ -29,6 +28,8 @@ include/cups/ppd.h
 include/cups/raster.h
 include/cups/sidechannel.h
 include/cups/transcode.h
+@lib lib/libcups.so.${LIBcups_VERSION}
+@lib lib/libcupsimage.so.${LIBcupsimage_VERSION}
 libexec/cups/
 libexec/cups/backend/
 libexec/cups/backend/http