diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 82e82dcab45c..e2abf5d27c23 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -18,28 +18,30 @@ MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
 MAINTAINER?=	DougB@FreeBSD.org
 
-LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle
+LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle \
+		xml.5:${PORTSDIR}/textproc/libxml
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	libxml gtk12
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
 		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
-		--with-jpeg=${LOCALBASE} \
-		--without-gnome --without-motif --without-pixbuf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		X_CFLAGS="-I${LOCALBASE}/include/gnome-xml"
+		--with-jpeg=${LOCALBASE} --without-gnome --without-kerberos
+
+.include <bsd.port.pre.mk>
 
 .if defined(XS_WITH_ALL_FORTUNES)
 CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
 .endif
 
+.undef HAVE_GNOME
+
+CONFIGURE_ENV=	X_CFLAGS=-I${LOCALBASE}/include/gnome-xml
+
 MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	blitspin.1 bouboule.1 boxed.1 braid.1 bsod.1 bubble3d.1 bubbles.1 \
 	bumps.1 cage.1 ccurve.1 circuit.1 compass.1 coral.1 critical.1 \
@@ -67,6 +69,18 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
 
+pre-fetch:
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+	@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || \
+		/usr/bin/true)
+	@${ECHO} ''
+	@${ECHO} '*** This is the non-gnome version of the port.'
+	@${ECHO} '    If you want gnome support, hit Ctrl-C now,'
+	@${ECHO} '    and cd ../xscreensaver-gnome.'
+	@${ECHO} ''
+	@sleep 2
+.endif
+
 post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
 	@ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
@@ -77,4 +91,10 @@ post-patch:
 		${WRKSRC}/hacks/glx/${file}
 .endfor
 
-.include <bsd.port.mk>
+post-install:
+	@(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
+		${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
+			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
+			${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
+
+.include <bsd.port.post.mk>
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
deleted file mode 100644
index c7e40e2c7bdd..000000000000
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/Makefile.in.orig	Fri May 31 20:43:49 2002
-+++ driver/Makefile.in	Wed Jun  5 00:37:42 2002
-@@ -24,7 +24,7 @@
- 
- GNOME_DATADIR	= @GNOME_DATADIR@
- GNOME_CCDIR	= $(GNOME_DATADIR)/control-center/Desktop
--GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
-+GNOME_PANELDIR1 = $(GNOME_DATADIR)/apps/Settings/Desktop
- GNOME_PANELDIR2	= $(GNOME_DATADIR)/applications
- GNOME_PANELDIR	= @GNOME_PANELDIR@
- GLADE_DATADIR	= @GLADE_DATADIR@
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 52fe126d20cc..b827fe7873cf 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -152,24 +152,6 @@ bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
 lib/X11/app-defaults/XScreenSaver
-share/locale/ca/LC_MESSAGES/xscreensaver.mo
-share/locale/da/LC_MESSAGES/xscreensaver.mo
-share/locale/de/LC_MESSAGES/xscreensaver.mo
-share/locale/es/LC_MESSAGES/xscreensaver.mo
-share/locale/et/LC_MESSAGES/xscreensaver.mo
-share/locale/fi/LC_MESSAGES/xscreensaver.mo
-share/locale/fr/LC_MESSAGES/xscreensaver.mo
-share/locale/hu/LC_MESSAGES/xscreensaver.mo
-share/locale/it/LC_MESSAGES/xscreensaver.mo
-share/locale/ja/LC_MESSAGES/xscreensaver.mo
-share/locale/ko/LC_MESSAGES/xscreensaver.mo
-share/locale/no/LC_MESSAGES/xscreensaver.mo
-share/locale/pl/LC_MESSAGES/xscreensaver.mo
-share/locale/pt/LC_MESSAGES/xscreensaver.mo
-share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
-share/locale/ru/LC_MESSAGES/xscreensaver.mo
-share/locale/sv/LC_MESSAGES/xscreensaver.mo
-share/locale/wa/LC_MESSAGES/xscreensaver.mo
 share/xscreensaver/xscreensaver.xpm
 share/xscreensaver/screensaver-cmndln.xpm
 share/xscreensaver/screensaver-colorselector.xpm