diff --git a/WindowMaker-composite.patch b/WindowMaker-composite.patch
new file mode 100644
index 0000000..c2fbef9
--- /dev/null
+++ b/WindowMaker-composite.patch
@@ -0,0 +1,20 @@
+--- src/main.c
++++ src/main.c
+@@ -835,6 +835,17 @@
+         exit(1);
+     }
+ 
++    if (wVisualID < 0)
++        /*
++         *   If unspecified, use default visual instead of waiting
++         * for wrlib/context.c:bestContext() that may end up choosing
++         * the "fake" 24 bits added by the Composite extension.
++         *   This is required to avoid all sort of corruptions when
++         * composite is enabled, and at a depth other than 24.
++         */
++        wVisualID = (int)DefaultVisual(dpy, DefaultScreen(dpy))->visualid;
++
++
+     /* check if the user specified a complete display name (with screen).
+      * If so, only manage the specified screen */
+     if (DisplayName)
diff --git a/WindowMaker.changes b/WindowMaker.changes
index 1d9eb6a..441fdec 100644
--- a/WindowMaker.changes
+++ b/WindowMaker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 13 10:42:08 CEST 2008 - nadvornik@suse.cz
+
+- fixed composite extension usage [bnc#433808]
+
 -------------------------------------------------------------------
 Thu May 22 16:44:21 CEST 2008 - pgajdos@suse.cz
 
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 6df5e61..d6789bb 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -2,9 +2,16 @@
 # spec file for package WindowMaker (Version 0.92.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -22,7 +29,7 @@ Requires:       xdg-menu
 AutoReqProv:    on
 Summary:        A Colorful and Flexible Window Manager
 Version:        0.92.0
-Release:        167
+Release:        204
 Source:         WindowMaker-%{version}.tar.bz2
 Source1:        WindowMaker-extra-0.1.tar.bz2
 Source2:        SuSE-theme.tar.bz2
@@ -48,6 +55,7 @@ Patch36:        WindowMaker-exec.patch
 Patch37:        WindowMaker-event.patch
 Patch38:        WindowMaker-wmspec.c-findBestIcon.patch
 Patch39:        WindowMaker-dir-specification.patch
+Patch40:        WindowMaker-composite.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package devel
@@ -99,6 +107,7 @@ cp WindowMaker/{menu.*,plmenu.*} menu.orig
 %patch37
 %patch38
 %patch39
+%patch40
 cp %{S:4} .
 cp %{S:6} .
 rename no nb po/no.*
@@ -181,6 +190,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/*.la
 
 %changelog
+* Mon Oct 13 2008 nadvornik@suse.cz
+- fixed composite extension usage [bnc#433808]
 * Thu May 22 2008 pgajdos@suse.cz
 - fixed "local variable used before set" [bnc#353376]
 * Mon Apr 28 2008 ro@suse.de