diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest
index af39747..ac3be42 100644
--- a/x11-plugins/cairo-dock-plugins/Manifest
+++ b/x11-plugins/cairo-dock-plugins/Manifest
@@ -1,3 +1,4 @@
-DIST cairo-dock-plugins-2.2.0-4.tar.gz 5533523 RMD160 33e6ad6831e66d9da5ad313210913f9d81138502 SHA1 1873ae26a1d90f8ac3cfde665536eca5dab7645f SHA256 e8905dc6f397c89b53b6e6a15489bf4d78e19427bd95e01f7c1b3df21a564ce2
-EBUILD cairo-dock-plugins-2.2.0.4.ebuild 2439 RMD160 8570ee820438a1f828c74bb117cdbf5b3f741bdb SHA1 53d7c5761987f74769ca8b3efbc5908c37b3aba3 SHA256 12f751fe5dbdc5e8d5092ed35535717af7b48559c3670ee15e648eb8e2f41bee
+AUX cairo-dock-plugins-2.3.0.2-sandbox.patch 1618 RMD160 ea46e850a2f582ab4f2b39c59d2782252b7398f6 SHA1 397392a01b86495a2b1bb2ba37ff524f53ff0365 SHA256 bfdb7ce2898ea90be9432623821352d745d0ec9eb547dafdcbdbc0af8a49cd91
+DIST cairo-dock-plugins-2.3.0~2.tar.gz 5959375 RMD160 45b3fb45f3935d2b7ee8b54dae3517a8ab616da1 SHA1 fad02d281c5d2ffd0f95221aca6866f1ad34f976 SHA256 c37db1584ebc9328aee4743c030d66cf2087a7ec3aa772510cf8c9ad14f02b2e
+EBUILD cairo-dock-plugins-2.3.0.2.ebuild 2499 RMD160 9fe9ae45046a62ec5c6aa4cc7235660093c5122f SHA1 5ad9d846688cfd7a3382541d07acdb035f935141 SHA256 4171c927c3c8d19b1d2035c88bc5c69ad7536c31627926da6e942ef31771d0e4
 EBUILD cairo-dock-plugins-9999.ebuild 1986 RMD160 479d0934db023e761eafad50416cf5557381e600 SHA1 e8792ea17cbf2c4702085b0a19a2c79e5db5c35c SHA256 c05fe9bc5370160cce3a917b570182201e5d29500ee2335ad639e45be20ccbbf
diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.2.0.4.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.3.0.2.ebuild
similarity index 94%
rename from x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.2.0.4.ebuild
rename to x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.3.0.2.ebuild
index fb270fa..8c60a3f 100644
--- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.2.0.4.ebuild
+++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,7 +7,7 @@ EAPI="2"
 inherit cmake-utils eutils versionator
 
 MY_PN="${PN/plugins/plug-ins}"
-MY_PV=$(replace_version_separator 3 '-')
+MY_PV=$(replace_version_separator 3 '~')
 MM_PV=$(get_version_component_range '1-2')
 MMD_PV=$(get_version_component_range '1-3')
 
@@ -60,6 +60,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-sandbox.patch"
+}
+
 # Additional config options
 #dnd2share
 #rssreader
diff --git a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-2.3.0.2-sandbox.patch b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-2.3.0.2-sandbox.patch
new file mode 100644
index 0000000..19e8f3c
--- /dev/null
+++ b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-2.3.0.2-sandbox.patch
@@ -0,0 +1,24 @@
+diff -ru cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/bash/BashInstall.cmake.in cairo-dock-plugins-2.3.0~2/Dbus/interfaces/bash/BashInstall.cmake.in
+--- cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/bash/BashInstall.cmake.in	2011-10-03 07:51:28.000000000 -0700
++++ cairo-dock-plugins-2.3.0~2/Dbus/interfaces/bash/BashInstall.cmake.in	2012-01-27 18:31:33.714287648 -0800
+@@ -1,7 +1,7 @@
+ IF("@ROOT_PREFIX@" STREQUAL "")
+ 	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+ 					"setup.py" "install"
+-					"--prefix=${CMAKE_INSTALL_PREFIX}"
++					"--prefix=$ENV{D}${CMAKE_INSTALL_PREFIX}"
+ 					"@DEBIAN_INSTALL_LAYOUT@")
+ ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+ 	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+diff -ru cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/python/PythonInstall.cmake.in cairo-dock-plugins-2.3.0~2/Dbus/interfaces/python/PythonInstall.cmake.in
+--- cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/python/PythonInstall.cmake.in	2011-10-03 07:51:28.000000000 -0700
++++ cairo-dock-plugins-2.3.0~2/Dbus/interfaces/python/PythonInstall.cmake.in	2012-01-27 18:31:43.582287380 -0800
+@@ -1,7 +1,7 @@
+ IF("@ROOT_PREFIX@" STREQUAL "")
+ 	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+ 					"setup.py" "install"
+-					"--prefix=${CMAKE_INSTALL_PREFIX}"
++					"--prefix=$ENV{D}${CMAKE_INSTALL_PREFIX}"
+ 					"@DEBIAN_INSTALL_LAYOUT@")
+ ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+ 	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS