diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index da3d116..5bd907d 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,6 +1,5 @@
-AUX compiz-kde-4.8.patch 755 RMD160 26891333e27ee15959a36850b7895a6212f155df SHA1 fe3231b758dd4dd0c1e429382456e09ce1e01f6c SHA256 4feb22c82d21c9d870d669498badf95c01f735a85f8a5f4d63b4877b6f74df65
 AUX compiz-manager 9835 RMD160 0c579ebd41c22b4f33edb2d2d5b1e41ac30720ac SHA1 ff39aa8abf43e42895aec6696c3659773f927fd2 SHA256 e387ff9f01b84c572f31643316ed2ce2eacd11a92488e745ebcfd659945c6f1d
 AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
 DIST compiz-0.8.8.tar.bz2 1123892 RMD160 430e6ce18e2fc7f6b95907dbc089ec26c2629773 SHA1 ca86f8586f921f084d32c2548a5d2170179a5caf SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3
-EBUILD compiz-0.8.8-r9999.ebuild 4193 RMD160 f1450561b66fd62428c3ee02cdaf3c39e6a7df51 SHA1 94f08d66db682479ee9eb3cf59098d4ec3069e0c SHA256 669118b26bb2533b95cd67a24d8f575338acf3d19900eeda2e4281f0b9eca125
+EBUILD compiz-0.8.8-r9999.ebuild 4099 RMD160 dba149ddbe7bcba96386692b43f3cff3df37d955 SHA1 92b10e36baca2463602f3725688e2d1092959bf6 SHA256 6147360a9606905e9c4e5513788c21628b1266a88282e49ab0dde9f95d395e9d
diff --git a/x11-wm/compiz/compiz-0.8.8-r9999.ebuild b/x11-wm/compiz/compiz-0.8.8-r9999.ebuild
index 60f9394..173525b 100644
--- a/x11-wm/compiz/compiz-0.8.8-r9999.ebuild
+++ b/x11-wm/compiz/compiz-0.8.8-r9999.ebuild
@@ -13,8 +13,7 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# dbus has been disabled because of bug 365121
-IUSE="+cairo fuse gnome gconf gtk kde +svg" # dbus
+IUSE="+cairo dbus fuse gnome gconf gtk kde +svg"
 
 COMMONDEPEND="
 	dev-libs/glib:2
@@ -57,8 +56,8 @@ COMMONDEPEND="
 		>=gnome-base/librsvg-2.14.0:2
 		>=x11-libs/cairo-1.0
 	)
+	dbus? ( >=sys-apps/dbus-1.0 )
 "
-# dbus? ( >=sys-apps/dbus-1.0 )
 
 DEPEND="${COMMONDEPEND}
 	dev-util/pkgconfig
@@ -109,8 +108,8 @@ src_configure() {
 		--with-default-plugins \
 		$(use_enable svg librsvg) \
 		$(use_enable cairo annotate) \
-		--disable-dbus \
-		--disable-dbus-glib \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-glib) \
 		$(use_enable fuse) \
 		$(use_enable gnome) \
 		$(use_enable gnome metacity) \
@@ -118,9 +117,6 @@ src_configure() {
 		$(use_enable kde kde4) \
 		--disable-kde \
 		${myconf}
-
-		# $(use_enable dbus)
-		# $(use_enable dbus dbus-glib)
 }
 
 src_install() {