8 files changed, 6 insertions, 5 deletions
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index 42b04b88ede..fc7b6c81e23 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -72,13 +72,13 @@ RDEPEND="
 	handbook? ( kde-apps/khelpcenter:* )
 	!minimal? (
 		$(add_kdeapps_dep kdepasswd)
-		$(add_kdebase_dep klipper)
 		kde-plasma/freespacenotifier:4
 		kde-plasma/kcheckpass:4
 		kde-plasma/kdebase-cursors:4
 		kde-plasma/kephal:4
 		kde-plasma/khotkeys:4
 		kde-plasma/kinfocenter:4
+		kde-plasma/klipper:4
 		kde-plasma/kmenuedit:4
 		kde-plasma/kstyles:4
 		kde-plasma/ksysguard:4
diff --git a/kde-base/klipper/Manifest b/kde-plasma/klipper/Manifest
index db5163f8398..db5163f8398 100644
--- a/kde-base/klipper/Manifest
+++ b/kde-plasma/klipper/Manifest
diff --git a/kde-base/klipper/klipper-4.11.22.ebuild b/kde-plasma/klipper/klipper-4.11.22.ebuild
index b550709adc2..046473454b5 100644
--- a/kde-base/klipper/klipper-4.11.22.ebuild
+++ b/kde-plasma/klipper/klipper-4.11.22.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 inherit kde4-meta
 
-DESCRIPTION="Applet for KDE and X clipboard management"
+DESCRIPTION="Applet for KDE Plasma and X clipboard management"
 HOMEPAGE+=" https://userbase.kde.org/Klipper"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug prison"
diff --git a/kde-base/klipper/metadata.xml b/kde-plasma/klipper/metadata.xml
index 774c489ee02..774c489ee02 100644
--- a/kde-base/klipper/metadata.xml
+++ b/kde-plasma/klipper/metadata.xml
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
index 77284162e30..29e04345705 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
+	!kde-plasma/klipper:4
 	!kde-base/krunner:4
 	!kde-base/ksmserver:4
 	!kde-plasma/ksplash:4
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
index 762e87d2f7a..593eb91edc1 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
+	!kde-plasma/klipper:4
 	!kde-base/krunner:4
 	!kde-base/ksmserver:4
 	!kde-plasma/ksplash:4
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
index 9f13649771f..20fc0b9d6d4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/libtaskmanager:4
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
+	!kde-plasma/klipper:4
 	!kde-base/krunner:4
 	!kde-base/ksmserver:4
 	!kde-plasma/ksplash:4
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 57c2d943726..3f015126467 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -45,3 +45,4 @@ move kde-base/libplasmagenericshell kde-plasma/libplasmagenericshell
 move kde-base/libplasmaclock kde-plasma/libplasmaclock
 move kde-base/libtaskmanager kde-plasma/libtaskmanager
 move media-libs/prison kde-frameworks/prison
+move kde-base/klipper kde-plasma/klipper