diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 99c78001d57a..6d31dcd813e9 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2007/06/05 05:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2007/07/20 12:11:21 drochner Exp $
 #
 
-DISTNAME=	gdm-2.18.1
-PKGREVISION=	2
+DISTNAME=	gdm-2.18.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -72,7 +71,9 @@ SUBST_FILES.desktop+=	config/gdm.conf.in
 SUBST_SED.desktop=	-e 's/^_//g'
 SUBST_SED.desktop+=	-e 's|^User=gdm$$|User=${GDMOWN}|g'
 SUBST_SED.desktop+=	-e 's|^Group=gdm$$|Group=${GDMGRP}|g'
-SUBST_SED.desktop+=	-e 's|^\#Logo=.*$$|Logo=@EXPANDED_PIXMAPDIR@/NetBSD.xpm|g'
+.if ${OPSYS} == "NetBSD"
+SUBST_SED.desktop+=	-e 's|^\#Logo=.*$$|Logo=${PREFIX}/share/pixmaps/NetBSD.xpm|g'
+.endif
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
 SUBST_SED.desktop+=	-e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r now|g'
 SUBST_SED.desktop+=	-e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g'
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 84c257f709bd..c11ba439d59a 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2007/04/11 20:40:07 drochner Exp $
+@comment $NetBSD: PLIST,v 1.33 2007/07/20 12:11:21 drochner Exp $
 ${DMX}bin/gdm-dmx-reconnect-proxy
 bin/gdmXnest
 bin/gdmXnestchooser
@@ -151,6 +151,7 @@ share/locale/ne/LC_MESSAGES/gdm.mo
 share/locale/nl/LC_MESSAGES/gdm.mo
 share/locale/nn/LC_MESSAGES/gdm.mo
 share/locale/nso/LC_MESSAGES/gdm.mo
+share/locale/oc/LC_MESSAGES/gdm.mo
 share/locale/or/LC_MESSAGES/gdm.mo
 share/locale/pa/LC_MESSAGES/gdm.mo
 share/locale/pl/LC_MESSAGES/gdm.mo
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index b1ea52aa4555..e4bb678c9244 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.48 2007/04/11 20:40:07 drochner Exp $
+$NetBSD: distinfo,v 1.49 2007/07/20 12:11:21 drochner Exp $
 
-SHA1 (gdm-2.18.1.tar.bz2) = 70b902ff810a69109746c135dd095db34982a9d0
-RMD160 (gdm-2.18.1.tar.bz2) = cb2296bc61eccd6dfa8df8ad071a14e58f8dd80d
-Size (gdm-2.18.1.tar.bz2) = 3460665 bytes
+SHA1 (gdm-2.18.3.tar.bz2) = e3285fafe563a1ca1708d067478cfcd6e63acef2
+RMD160 (gdm-2.18.3.tar.bz2) = 4c55bb00a7c62cfa23e1edf3211a198222e89c07
+Size (gdm-2.18.3.tar.bz2) = 3461043 bytes
 SHA1 (patch-aa) = 56232879fbb5d885aa164e94baf3368e950c433f
 SHA1 (patch-ab) = b151843608e3418962dfcbfd454cf0ba8aac39e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c