diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index b6c197b06004..5febac00dee0 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdm2
 PORTVERSION=	2.4.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		2.0.1/sources/${PORTNAME:S/2$//}
diff --git a/x11/gdm2/files/gdm.sh.sample b/x11/gdm2/files/gdm.sh.sample
index 6390bea233ee..1b9f904996e0 100644
--- a/x11/gdm2/files/gdm.sh.sample
+++ b/x11/gdm2/files/gdm.sh.sample
@@ -9,7 +9,7 @@ start)
 	${PREFIX}/bin/gdm
 	;;
 stop)
-	/usr/bin/killall gdm 2>/dev/null
+	/usr/bin/killall -m gdm 2>/dev/null
 	;;
 *)
 	echo "Usage: `basename $0` start | stop"
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index 322f08900385..a162ae14275f 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -1,5 +1,5 @@
---- config/locale.alias.orig	Sat Aug 31 14:19:53 2002
-+++ config/locale.alias	Sat Aug 31 14:33:32 2002
+--- config/locale.alias.orig	Thu Aug 22 18:47:35 2002
++++ config/locale.alias	Wed Sep 18 22:18:10 2002
 @@ -14,54 +14,36 @@
  #
  #		- George
@@ -17,15 +17,7 @@
 -Danish			da_DK.utf8,da_DK
 -Dutch			nl_NL.utf8,nl_NL
 -Estonian		et_EE.utf8,et_EE
-+Bulgarian		bg_BG.utf8,bg_BG.CP1251
-+Chinese(simplified)	zh_CN.utf8,zh_CN.EUC
-+Chinese(traditional)	zh_TW.utf8,zh_TW.Big5
-+Croatian		hr_HR.utf8,hr_HR.ISO_8859-2
-+Czech			cs_CZ.utf8,cs_CZ.ISO_8859-2
-+Danish			da_DK.utf8,da_DK.ISO_8859-1
-+Dutch			nl_NL.utf8,nl_NL.ISO_8859-1
-+Estonian		et_EE.utf8,et_EE.ISO_8859-15
- English(American)	en_US.utf8,en_US
+-English(American)	en_US.utf8,en_US
 -English(Australian)	en_AU.utf8,en_AU
 -English(British)	en_GB.utf8,en_GB
 -English(Ireland)	en_IE.utf8,en_IE
@@ -63,6 +55,15 @@
 -Ukrainian		uk_UA.utf8,uk_UA
 -Vietnamese		vi_VN.utf8,vi_VN
 -Walloon			wa_BE.utf8,wa_BE
++Bulgarian		bg_BG.utf8,bg_BG.CP1251
++Chinese(simplified)	zh_CN.utf8,zh_CN.EUC
++Chinese(traditional)	zh_TW.utf8,zh_TW.Big5
++Croatian		hr_HR.utf8,hr_HR.ISO_8859-2
++Czech			cs_CZ.utf8,cs_CZ.ISO_8859-2
++Danish			da_DK.utf8,da_DK.ISO_8859-1
++Dutch			nl_NL.utf8,nl_NL.ISO_8859-1
++Estonian		et_EE.utf8,et_EE.ISO_8859-15
++English(American)	en_US.utf8,en_US.ISO_8859-1
 +English(Australian)	en_AU.utf8,en_AU.ISO_8859-1
 +English(British)	en_GB.utf8,en_GB.ISO_8859-1
 +Finnish			fi_FI.utf8,fi_FI.ISO_8859-1
diff --git a/x11/gdm2/files/patch-daemon_slave.c b/x11/gdm2/files/patch-daemon_slave.c
new file mode 100644
index 000000000000..27ac0544a6df
--- /dev/null
+++ b/x11/gdm2/files/patch-daemon_slave.c
@@ -0,0 +1,12 @@
+--- daemon/slave.c.orig	Wed Sep 18 02:25:09 2002
++++ daemon/slave.c	Wed Sep 18 02:25:15 2002
+@@ -2327,7 +2327,8 @@
+ 	if (setusercontext (NULL, pwent, pwent->pw_uid,
+ 			    LOGIN_SETLOGIN | LOGIN_SETPATH |
+ 			    LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
+-			    LOGIN_SETUMASK | LOGIN_SETUSER) < 0)
++			    LOGIN_SETUMASK | LOGIN_SETUSER |
++			    LOGIN_SETENV) < 0)
+ 		gdm_child_exit (DISPLAY_REMANAGE,
+ 				_("%s: setusercontext() failed for %s. "
+ 				  "Aborting."), "gdm_slave_session_start",