diff --git a/ChangeLog b/ChangeLog
index d4c989610..1093f9235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-04  Elijah Newren  <newren gmail com>
+
+	Patch from Dmitry Timoshkov to fix the heuristic for determining
+	if windows can be made fullscreen (needed for WINE and possible
+	also some legacy applications).  Part of #346927.
+
+	* src/window.c (recalc_window_features): ignore window decoration
+	when checking size for determing whether an unresizable window
+	should be allowed ot be considered for fullscreening
+
 2006-07-31  Björn Lindqvist  <bjourne@gmail.com>
 
 	* src/window.c: Make it so maximized windows do not have rounded
diff --git a/src/window.c b/src/window.c
index 1c48e7c89..0d56e69d0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5898,8 +5898,7 @@ recalc_window_features (MetaWindow *window)
        * actually fullscreen to xinerama head size not screen size)
        */
       if (window->size_hints.min_width == window->screen->rect.width &&
-          window->size_hints.min_height == window->screen->rect.height &&
-          !window->decorated)
+          window->size_hints.min_height == window->screen->rect.height)
         ; /* leave fullscreen available */
       else
         window->has_fullscreen_func = FALSE;