diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index bc1e84017e0b..0d18d2cfbfbd 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,61 +1,61 @@
 # New ports collection makefile for:	gnomesession
 # Date created:				08 May 2002
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #   $MCom: ports/x11/gnome-session/Makefile,v 1.110 2007/03/18 20:55:55 marcus Exp $
 #
 
 PORTNAME=	gnome-session
 PORTVERSION=	2.18.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.marcuscom.com/downloads/:local
 MASTER_SITE_SUBDIR=	sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${SPLASHES}:local
 DIST_SUBDIR=	gnome2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the GNOME 2 desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 MAN1=		gnome-session.1 gnome-wm.1 session-properties.1 \
 		gnome-session-save.1
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
 SPLASHES=	freebsd-splashes-gnome-2.18_1.tar
 
 post-extract:
 	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
 		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
 #	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
 #		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
 .for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
 	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
 		${PREFIX}/share/gnome/pixmaps/splash
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c b/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c
deleted file mode 100644
index 76de78b45ffe..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_gsm-dbus.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- gnome-session/gsm-dbus.c.orig	Mon Jan  8 17:32:28 2007
-+++ gnome-session/gsm-dbus.c	Thu Jan 11 13:17:41 2007
-@@ -281,6 +281,7 @@ start_parent (int address_fd, int pid_fd
-   int exitstat;
-   unsigned long tmp_num;
-   ssize_t bytes;
-+  int i;
- 
-   g_assert (child > 0);
- 
-@@ -326,14 +327,17 @@ start_parent (int address_fd, int pid_fd
-   /*
-    * Fetch dbus-daemon pid.
-    */
--  bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
--  if (bytes == -1 || bytes == 0)
-+  for (i = 0; i < 2; i++)
-     {
--      close (address_fd);
--      close (pid_fd);
--
--      g_printerr ("Failed to get dbus-daemon's pid\n");
--      return;
-+      bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
-+      if (bytes == -1 || bytes == 0)
-+        {
-+          close (address_fd);
-+          close (pid_fd);
-+
-+          g_printerr ("Failed to get dbus-daemon's pid\n");
-+          return;
-+        }
-     }
- 
-   close (address_fd);