diff --git a/docs/changes.txt b/docs/changes.txt
index cccb79cf08..e5ccc8e64d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -176,18 +176,16 @@ OTHER CHANGES
 All:
 
 - fixed wxLANGUAGE_CHINESE_TAIWAN to use zh_TW catalogs
+- added missing wx/quantize.h to install
+
+Unix (GUI):
+
+- fixed the "close" button of dialogs under KDE 3.1
 
 wxBase
 
 - compilation with wxUSE_ODBC=1 fixed (dbkeyg.h file was missing in the archive)
 
-2.4.0.2
--------
-
-All:
-
-- added missing wx/quantize.h to install
-
 wxGTK:
 
 - added wxEVT_MENU_OPEN event generation
@@ -228,10 +226,12 @@ Unix (Base/GUI):
 - shared library symbols are now versioned on platforms that support it (Linux)
 
 wxGTK:
+
 - Further work for GTK 2.0 and Unicode support.
 - Addition of native frame site grip.
 
 wxX11:
+
 - Unicode support through Pango library.
 
 wxMSW:
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 0866c33410..ee33e1ef40 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -447,15 +447,16 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     else
     {
         m_gdkDecor = (long) GDK_DECOR_BORDER;
-        m_gdkFunc = (long) GDK_FUNC_MOVE;
+        m_gdkFunc = (long) GDK_FUNC_MOVE | GDK_FUNC_CLOSE;
 
         // All this is for Motif Window Manager "hints" and is supposed to be
         // recognized by other WMs as well.
         if ((style & wxCAPTION) != 0)
+        {
             m_gdkDecor |= GDK_DECOR_TITLE;
+        }
         if ((style & wxSYSTEM_MENU) != 0)
         {
-            m_gdkFunc |= GDK_FUNC_CLOSE;
             m_gdkDecor |= GDK_DECOR_MENU;
         }
         if ((style & wxMINIMIZE_BOX) != 0)
diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 0866c33410..ee33e1ef40 100644
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -447,15 +447,16 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     else
     {
         m_gdkDecor = (long) GDK_DECOR_BORDER;
-        m_gdkFunc = (long) GDK_FUNC_MOVE;
+        m_gdkFunc = (long) GDK_FUNC_MOVE | GDK_FUNC_CLOSE;
 
         // All this is for Motif Window Manager "hints" and is supposed to be
         // recognized by other WMs as well.
         if ((style & wxCAPTION) != 0)
+        {
             m_gdkDecor |= GDK_DECOR_TITLE;
+        }
         if ((style & wxSYSTEM_MENU) != 0)
         {
-            m_gdkFunc |= GDK_FUNC_CLOSE;
             m_gdkDecor |= GDK_DECOR_MENU;
         }
         if ((style & wxMINIMIZE_BOX) != 0)
diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index fdcf28a869..21fdac3bac 100644
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -668,8 +668,8 @@ bool wxSetWMDecorations(Window w, long style)
 #if wxUSE_NANOX
     GR_WM_PROPERTIES wmProp;
 
-    wmProp.flags = 0;
-    wmProp.props = 0;
+    wmProp.props = GR_WM_PROPS_CLOSEBOX ;
+    wmProp.flags = GR_WM_FLAGS_PROPS ;
 
     if (style & wxRESIZE_BORDER)
     {
@@ -677,12 +677,6 @@ bool wxSetWMDecorations(Window w, long style)
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
-    if (style & wxSYSTEM_MENU)
-    {
-        wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-    }
-
     if ((style & wxCAPTION) ||
         (style & wxTINY_CAPTION_HORIZ) ||
         (style & wxTINY_CAPTION_VERT))
@@ -745,14 +739,13 @@ bool wxSetWMDecorations(Window w, long style)
     else
     {
         hints.decorations = MWM_DECOR_BORDER;
-        hints.functions = MWM_FUNC_MOVE;
+        hints.functions = MWM_FUNC_MOVE | MWM_FUNC_CLOSE;
 
         if ((style & wxCAPTION) != 0)
             hints.decorations |= MWM_DECOR_TITLE;
             
         if ((style & wxSYSTEM_MENU) != 0)
         {
-            hints.functions |= MWM_FUNC_CLOSE;
             hints.decorations |= MWM_DECOR_MENU;
         }