diff --git a/x11-tools.changes b/x11-tools.changes
index cdbc7b1..5ad0b14 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 22 15:52:48 UTC 2014 - fcrozat@suse.com
+
+- Improve GNOME detection for Classic mode.
+
 -------------------------------------------------------------------
 Thu Jan  9 08:07:07 UTC 2014 - lnussel@suse.de
 
diff --git a/xim b/xim
index 6ce08de..da509fd 100644
--- a/xim
+++ b/xim
@@ -95,7 +95,9 @@ gnome_ibus_workaround () {
     im=${im##*/}
     im=${im#[0-9][0-9]-}
     test "$im" = "none" && return
-    if [ "${WINDOWMANAGER##*/}" = "gnome-session" ]; then
+    windowmanager=${WINDOWMANAGER##*/}
+    windowmanager=${windowmanager%-*}
+    if [ "$windowmanager" = "gnome" ]; then
        local active
        if [ "$im" = "ibus" ]; then
            active=true