diff --git a/compiz-0.8.2-icon-fix.patch b/compiz-0.8.2-icon-fix.patch
new file mode 100644
index 0000000..c712da6
--- /dev/null
+++ b/compiz-0.8.2-icon-fix.patch
@@ -0,0 +1,22 @@
+From 4c7ffc4f1d82414a466fa0768d16fa96f30e3f7a Mon Sep 17 00:00:00 2001
+From: Danny Baumann <dannybaumann@web.de>
+Date: Tue, 08 Dec 2009 10:28:30 +0000
+Subject: Fix icon property reading if the icon pixmap has a depth of 1 bit.
+
+---
+diff --git a/src/window.c b/src/window.c
+index 6e54470..90922d1 100644
+--- a/src/window.c
++++ b/src/window.c
+@@ -5298,6 +5298,8 @@ readWindowIconHint (CompWindow *w)
+ 	{
+ 	    if (maskImage && !XGetPixel (maskImage, i, j))
+ 		*p++ = 0;
++	    else if (image->depth == 1)
++		*p++ = colors[k].pixel ? 0xffffffff : 0xff000000;
+ 	    else
+ 		*p++ = 0xff000000                             | /* alpha */
+ 		       (((colors[k].red >> 8) & 0xff) << 16)  | /* red */
+--
+cgit v0.8.2
+
diff --git a/compiz-0.8.2-multiscreen-decorator.patch b/compiz-0.8.2-multiscreen-decorator.patch
new file mode 100644
index 0000000..90827a3
--- /dev/null
+++ b/compiz-0.8.2-multiscreen-decorator.patch
@@ -0,0 +1,11 @@
+diff -upNr compiz-0.8.2.orign/metadata/decoration.xml.in compiz-0.8.2/metadata/decoration.xml.in
+--- compiz-0.8.2.orign/metadata/decoration.xml.in	2009-02-15 10:10:23.000000000 +0100
++++ compiz-0.8.2/metadata/decoration.xml.in	2009-12-26 17:26:47.997385112 +0100
+@@ -50,6 +50,7 @@
+ 	    <option name="command" type="string">
+ 		<_short>Command</_short>
+ 		<_long>Decorator command line that is executed if no decorator is already running</_long>
++		<default>gtk-window-decorator</default>
+ 	    </option>
+ 	    <option name="mipmap" type="bool">
+ 		<_short>Mipmap</_short>
diff --git a/compiz-0.8.2-wall.patch b/compiz-0.8.2-wall.patch
index 6bd1147..c1e8e96 100644
--- a/compiz-0.8.2-wall.patch
+++ b/compiz-0.8.2-wall.patch
@@ -1,6 +1,6 @@
 diff -upNr compiz-0.8.2.orign/metadata/Makefile.am compiz-0.8.2/metadata/Makefile.am
 --- compiz-0.8.2.orign/metadata/Makefile.am	2009-02-15 10:11:43.000000000 +0100
-+++ compiz-0.8.2/metadata/Makefile.am	2009-07-11 10:36:15.265893844 +0200
++++ compiz-0.8.2/metadata/Makefile.am	2009-12-26 17:23:00.945580573 +0100
 @@ -31,6 +31,7 @@ xml_in_files =		   \
  	video.xml.in       \
  	water.xml.in       \
@@ -11,7 +11,7 @@ diff -upNr compiz-0.8.2.orign/metadata/Makefile.am compiz-0.8.2/metadata/Makefil
  xml_DATA     = $(xml_files)
 diff -upNr compiz-0.8.2.orign/metadata/wall.xml.in compiz-0.8.2/metadata/wall.xml.in
 --- compiz-0.8.2.orign/metadata/wall.xml.in	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/metadata/wall.xml.in	2009-03-05 04:36:21.000000000 +0100
++++ compiz-0.8.2/metadata/wall.xml.in	2009-12-26 17:23:00.945580573 +0100
 @@ -0,0 +1,357 @@
 +<?xml version="1.0"?>
 +<compiz>
@@ -372,7 +372,7 @@ diff -upNr compiz-0.8.2.orign/metadata/wall.xml.in compiz-0.8.2/metadata/wall.xm
 +</compiz>
 diff -upNr compiz-0.8.2.orign/plugins/Makefile.am compiz-0.8.2/plugins/Makefile.am
 --- compiz-0.8.2.orign/plugins/Makefile.am	2009-02-15 10:10:23.000000000 +0100
-+++ compiz-0.8.2/plugins/Makefile.am	2009-07-11 10:19:29.303832241 +0200
++++ compiz-0.8.2/plugins/Makefile.am	2009-12-26 17:23:00.945580573 +0100
 @@ -74,6 +74,9 @@ libcommands_la_SOURCES = commands.c
  libgnomecompat_la_LDFLAGS = -module -avoid-version -no-undefined
  libgnomecompat_la_SOURCES = gnomecompat.c
@@ -403,8 +403,8 @@ diff -upNr compiz-0.8.2.orign/plugins/Makefile.am compiz-0.8.2/plugins/Makefile.
  	$(libinotify_module)	\
 diff -upNr compiz-0.8.2.orign/plugins/wall.c compiz-0.8.2/plugins/wall.c
 --- compiz-0.8.2.orign/plugins/wall.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/plugins/wall.c	2009-03-05 04:36:21.000000000 +0100
-@@ -0,0 +1,2215 @@
++++ compiz-0.8.2/plugins/wall.c	2009-12-26 17:23:54.400386828 +0100
+@@ -0,0 +1,2216 @@
 +/**
 + *
 + * Compiz wall plugin
@@ -2591,7 +2591,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wall.c compiz-0.8.2/plugins/wall.c
 +static Bool
 +wallInit (CompPlugin *p)
 +{
-+   dlopen ("libcairo.so.2", RTLD_LAZY);
++    dlopen ("libcairo.so.2", RTLD_LAZY);
 +    WallCorePrivateIndex = allocateCorePrivateIndex ();
 +    if (WallCorePrivateIndex < 0)
 +	return FALSE;
@@ -2623,7 +2623,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wall.c compiz-0.8.2/plugins/wall.c
 +}
 diff -upNr compiz-0.8.2.orign/plugins/wall_options.c compiz-0.8.2/plugins/wall_options.c
 --- compiz-0.8.2.orign/plugins/wall_options.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/plugins/wall_options.c	2009-07-10 23:02:20.185497000 +0200
++++ compiz-0.8.2/plugins/wall_options.c	2009-12-26 17:23:00.947534145 +0100
 @@ -0,0 +1,1936 @@
 +/*
 + * This file is autogenerated with bcop:
@@ -4563,7 +4563,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wall_options.c compiz-0.8.2/plugins/wall_o
 +
 diff -upNr compiz-0.8.2.orign/plugins/wall_options.h compiz-0.8.2/plugins/wall_options.h
 --- compiz-0.8.2.orign/plugins/wall_options.h	1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/plugins/wall_options.h	2009-07-10 23:02:18.076511000 +0200
++++ compiz-0.8.2/plugins/wall_options.h	2009-12-26 17:23:00.947534145 +0100
 @@ -0,0 +1,375 @@
 +/*
 + * This file is autogenerated with bcop:
diff --git a/compiz.spec b/compiz.spec
index 2e191cd..7927b43 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        20%{?dist}
+Release:        21%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,10 @@ Patch128: compiz-0.8.2-keybinding-lables.patch
 
 Patch129: compiz-0.8.2-unloadpluginfix.patch
 
+Patch130: compiz-0.8.2-multiscreen-decorator.patch
+
+Patch131: compiz-0.8.2-icon-fix.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -147,10 +151,8 @@ and other kde integration related stuff.
 %patch127 -p1 -b .unknown-key
 %patch128 -p1 -b .keybinding-lables
 %patch129 -p1 -b .unload-plugin
-
-#WTF?!
-cat plugins/wall.c | sed '$a\}' > plugins/wall.c
-
+%patch130 -p1 -b .multi-screen
+%patch131 -p1 -b .icon-fix
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -328,6 +330,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.2-21
+- Fix wall plugin regression
+- Fix decorator on multi screen setups (RH #546172)
+
 * Mon Nov 30 2009 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.2-20
 - Fix unloading of certain plugins resulting into a crash
 - RH #531714