--- Makefile	(revision 408861)
+++ Makefile	(working copy)
@@ -64,7 +64,7 @@ 
 CUPS_SUFFIX=	-image
 LICENSE=	LGPL21
 .else
-PORTREVISION=	5
+PORTREVISION=	6
 CUPS_SUFFIX=	-base
 # No DOCS option.  Files are needed by web interface.
 OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
@@ -72,13 +72,13 @@ 
 OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
 OPTIONS_RADIO=		ZEROCONF
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
-OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS
+OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS XDG_OPEN
 .endif
 
 ICONS_DESC=		Desktop icons
 LIBUSB_DESC=		USB support
 WEB_DESC=		Interpreters for web interfaces
-XDG_OPEN_DESC=		Build with XDG_OPEN as browser
+XDG_OPEN_DESC=		Use xdg-open as browser
 ZEROCONF_DESC=		Zeroconf support
 
 .include <bsd.port.options.mk>
@@ -168,6 +168,9 @@ 
 . endif
 
 . if ${PORT_OPTIONS:MXDG_OPEN}
+# Declare a build dependency on xdg-open so that CUPS' configure
+# script can find it.
+BUILD_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
 RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
 . endif
 
@@ -224,9 +227,6 @@ 
 	@${REINPLACE_CMD} -e 's|Darwin|FreeBSD|' \
 		${WRKSRC}/backend/Makefile
 .endif
-.if  ${PORT_OPTIONS:MXDG_OPEN}
-	@${REINPLACE_CMD} -e 's|htmlview|xdg-open|' ${WRKSRC}/desktop/cups.desktop.in
-.endif
 	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
 	@${REINPLACE_CMD} -e 's|/etc/cups|${LOCALBASE}/etc/cups|g' ${WRKSRC}/man/*.man*
 	@${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \