diff -u compiz-0.6.2+git20071119/debian/changelog compiz-0.6.2+git20071119/debian/changelog
--- compiz-0.6.2+git20071119/debian/changelog
+++ compiz-0.6.2+git20071119/debian/changelog
@@ -1,3 +1,11 @@
+compiz (1:0.6.2+git20071119-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/031_compiz_manager_default_window_manager
+    - Don't use matacity as the fallback window manager when it's not
+      installed (LP: #151005)
+
+ -- Terence Simpson <stdin@stdin.me.uk>  Sat, 24 Nov 2007 09:38:00 +0000
+
 compiz (1:0.6.2+git20071119-0ubuntu1) hardy; urgency=low
 
   * new 0.6 git snapshot:
diff -u compiz-0.6.2+git20071119/debian/patches/series compiz-0.6.2+git20071119/debian/patches/series
--- compiz-0.6.2+git20071119/debian/patches/series
+++ compiz-0.6.2+git20071119/debian/patches/series
@@ -18,2 +18,3 @@
 030_fix_screensaver
+031_compiz_manager_default_window_manager
 099-autogen.patch
only in patch2:
unchanged:
--- compiz-0.6.2+git20071119.orig/debian/patches/031_compiz_manager_default_window_manager
+++ compiz-0.6.2+git20071119/debian/patches/031_compiz_manager_default_window_manager
@@ -0,0 +1,17 @@
+Index: compiz-0.6.2+git20071119/debian/compiz-manager
+===================================================================
+--- compiz-0.6.2+git20071119.orig/debian/compiz-manager	2007-11-24 09:09:38.000000000 +0000
++++ compiz-0.6.2+git20071119/debian/compiz-manager	2007-11-24 09:25:01.000000000 +0000
+@@ -47,7 +47,11 @@
+ # For detecting what driver is in use, the + is for one or more /'s
+ XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
+ 
+-FALLBACKWM="${METACITY}"
++if [ -x $METACITY ]; then
++	FALLBACKWM="${METACITY}"
++else
++	FALLBACKWM="${KWIN}"
++fi
+ FALLBACKWM_OPTIONS="--replace $@"
+ 
+ # Driver whitelist