diff --git a/print/cups/Makefile b/print/cups/Makefile
index 5238d7cbf59..90faeaa787e 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.40 2009/03/15 18:31:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.41 2009/03/23 15:04:41 ajacoutot Exp $
 
 COMMENT=		Common Unix Printing System
 
 VERSION=		1.2.7
 DISTNAME=		cups-${VERSION}-source
-PKGNAME=		cups-${VERSION}p17
+PKGNAME=		cups-${VERSION}p18
 CATEGORIES=		print sysutils
 
 SHARED_LIBS+=		cups		3.0
@@ -36,14 +36,19 @@ RUN_DEPENDS=		:desktop-file-utils-*:devel/desktop-file-utils \
 			::devel/xdg-utils
 LIB_DEPENDS=		png.>=3::graphics/png \
 			jpeg.>=62::graphics/jpeg \
-			tiff.>=35::graphics/tiff
+			tiff.>=35::graphics/tiff \
+			dbus-1.>=7::x11/dbus
 
 FAKE_FLAGS=		BINMODE=${BINMODE} \
-			SHAREMODE=${SHAREMODE}
+			SHAREMODE=${SHAREMODE} \
+			DBUSDIR=${WRKINST}/${TRUEPREFIX}/share/examples/cups/dbus-1/system.d
 
 MAKE_ENV+=		LIBcups_VERSION=${LIBcups_VERSION} \
 			LIBcupsimage_VERSION=${LIBcupsimage_VERSION}
 
+# UTF8 desktop file patch
+DIFF_ARGS=		-a
+
 CONFIGURE_STYLE=	gnu dest
 AUTOCONF_VERSION=	2.59
 CONFIGURE_ARGS+=	--with-cups-user=_cups \
@@ -55,13 +60,13 @@ CONFIGURE_ARGS+=	--with-cups-user=_cups \
 			--without-perl \
 			--without-php \
 			--without-python \
-			--disable-dbus \
+			--enable-dbus \
 			--disable-gnutls
 
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
 			  -I${LOCALBASE}/include/libpng" \
 			DSOFLAGS="-L${LOCALBASE}/lib" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
+			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
 			LIBcups_VERSION=${LIBcups_VERSION} \
 			LIBcupsimage_VERSION=${LIBcupsimage_VERSION}
 
diff --git a/print/cups/patches/patch-configure b/print/cups/patches/patch-configure
index 0ecf4b22ffd..4890bf8dd09 100644
--- a/print/cups/patches/patch-configure
+++ b/print/cups/patches/patch-configure
@@ -1,6 +1,15 @@
-$OpenBSD: patch-configure,v 1.5 2007/12/11 08:00:06 jakemsr Exp $
---- configure.orig	Thu Nov 16 06:51:56 2006
-+++ configure	Sun Oct 21 00:41:30 2007
+$OpenBSD: patch-configure,v 1.6 2009/03/23 15:04:41 ajacoutot Exp $
+--- configure.orig	Thu Nov 16 15:51:56 2006
++++ configure	Mon Mar 23 15:38:33 2009
+@@ -7179,7 +7179,7 @@ done
+ 
+                 ;;
+ 
+-	Linux*)
++	*)
+ 				if test "x$enable_dbus" != xno; then
+ 			# Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
 @@ -7910,8 +7910,8 @@ if test x$enable_shared != xno; then
  			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index 666bf0ea8e6..8760301838a 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2008/11/19 05:28:31 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.17 2009/03/23 15:04:41 ajacoutot Exp $
 @conflict LPRng-*
 @newgroup _cups:541
 @newuser _cups:541:541:daemon:CUPS:/nonexistent:/sbin/nologin
@@ -1253,6 +1253,10 @@ share/examples/cups/
 share/examples/cups/cupsd.conf
 @sample ${SYSCONFDIR}/cups/cupsd.conf
 share/examples/cups/cupsd.conf.default
+share/examples/cups/dbus-1/
+share/examples/cups/dbus-1/system.d/
+share/examples/cups/dbus-1/system.d/cups.conf
+@sample ${SYSCONFDIR}/dbus-1/system.d/cups.conf
 share/examples/cups/init/
 @sample ${SYSCONFDIR}/cups/init/
 share/examples/cups/interfaces/