diff --git a/xfce4-session-4.8.1-fix-gdm_lang-usage.patch b/xfce4-session-4.8.1-fix-gdm_lang-usage.patch
new file mode 100644
index 0000000..90f7a04
--- /dev/null
+++ b/xfce4-session-4.8.1-fix-gdm_lang-usage.patch
@@ -0,0 +1,13 @@
+diff --git a/xfce4-session/main.c b/xfce4-session/main.c
+index ff6e324..fcf69f8 100644
+--- a/xfce4-session/main.c
++++ b/xfce4-session/main.c
+@@ -103,7 +103,7 @@ setup_environment (void)
+ 
+   /* this is for compatibility with the GNOME Display Manager */
+   lang = g_getenv ("GDM_LANG");
+-  if (lang != NULL)
++  if (lang != NULL && strlen (lang) > 0)
+     {
+       xfce_setenv ("LANG", lang, TRUE);
+       xfce_unsetenv ("GDM_LANG");
diff --git a/xfce4-session.changes b/xfce4-session.changes
index b4b8fe3..a54841d 100644
--- a/xfce4-session.changes
+++ b/xfce4-session.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 17 09:03:24 UTC 2011 - gber@opensuse.org
+
+- added xfce4-session-4.8.1-fix-gdm_lang-usage.patch which fixes
+  GDM_LANG usage to be compatible with GDM3 (bnc#694203, bxo#7400)
+
 -------------------------------------------------------------------
 Fri Apr  1 19:20:50 UTC 2011 - gber@opensuse.org
 
diff --git a/xfce4-session.spec b/xfce4-session.spec
index ad49869..bffcaf3 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -27,6 +27,8 @@ Group:          System/GUI/XFCE
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows
 Patch1:         xfce4-session-simple-splash-remove-shadows.patch
+# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-fix-gdm_lang-usage.patch bnc#694203 bxo#7400 gber@opensuse.org -- Fixes GDM_LANG usage to be compatible with GDM3 (backported from upstream git)
+Patch2:	        xfce4-session-4.8.1-fix-gdm_lang-usage.patch
 BuildRequires:  intltool
 BuildRequires:  perl-XML-Parser
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -87,6 +89,7 @@ This package provides the upstream look and feel for the Xfce Session Manager.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \