diff --git a/ChangeLog b/ChangeLog
index 34eb4d1..cbfb543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-06  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/xlib/XGServerWindow.m  (-setwindowlevel::): Stop using
+	the KDE override atom for window levels. The old behaviour may be
+	reactivated via the define USE_KDE_OVERRIDE.
+
 2004-11-28  Matt Rice <ratmice@yahoo.com>
 
 	* Source/x11/XGGLFormat.m (-initWithAttributes:,append,append1): Add 
diff --git a/Source/x11/XGServerWindow.m b/Source/x11/XGServerWindow.m
index c6a011e..1e963ee 100644
--- a/Source/x11/XGServerWindow.m
+++ b/Source/x11/XGServerWindow.m
@@ -1988,10 +1988,15 @@ static BOOL didCreatePixmaps;
 		   level == NSFloatingWindowLevel ||
 		   level == NSTornOffMenuWindowLevel)
 	    {
+#ifdef USE_KDE_OVERRIDE
 	      data[0] = generic.wintypes.win_override_atom;
 	      //data[0] = generic.wintypes.win_utility_atom;
 	      data[1] = generic.wintypes.win_menu_atom;
 	      len = 2;
+#else
+	      data[0] = generic.wintypes.win_menu_atom;
+	      len = 1;
+#endif
 	    }
 	  else if (level == NSDockWindowLevel ||
 		   level == NSStatusWindowLevel)
@@ -2001,9 +2006,14 @@ static BOOL didCreatePixmaps;
 	  // Does this belong into a different category?
 	  else if (level == NSPopUpMenuWindowLevel)
 	    {
+#ifdef USE_KDE_OVERRIDE
 	      data[0] = generic.wintypes.win_override_atom;
 	      data[1] = generic.wintypes.win_floating_atom;
 	      len = 2;
+#else
+	      data[0] = generic.wintypes.win_floating_atom;
+	      len = 1;
+#endif
 	    }
 	  else if (level == NSDesktopWindowLevel)
 	    {