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 65da84c829501..09975797afd5e 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
@@ -53,9 +53,9 @@ RDEPEND="
 	$(add_kdeapps_dep plasma-runtime)
 	$(add_kdeapps_dep renamedlg-plugins)
 	$(add_kdeapps_dep solid-runtime)
-	$(add_kdebase_dep krunner)
 	$(add_kdebase_dep plasma-workspace)
 	kde-plasma/kcminit:4
+	kde-plasma/krunner:4
 	kde-plasma/ksmserver:4
 	kde-plasma/ksplash:4
 	kde-plasma/kstartupconfig:4
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
index 3ff39531ccab8..d90ebf7163acd 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT=test
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
 	app-crypt/qca:2[qt4(+)]
-	$(add_kdebase_dep krunner '' 4.11)
+	kde-plasma/krunner:4
 	$(add_kdebase_dep plasma-workspace '' 4.11)
 	x11-misc/shared-mime-info
 	attica? ( dev-libs/libattica )
diff --git a/kde-base/krunner/Manifest b/kde-plasma/krunner/Manifest
similarity index 100%
rename from kde-base/krunner/Manifest
rename to kde-plasma/krunner/Manifest
diff --git a/kde-base/krunner/krunner-4.11.22.ebuild b/kde-plasma/krunner/krunner-4.11.22.ebuild
similarity index 95%
rename from kde-base/krunner/krunner-4.11.22.ebuild
rename to kde-plasma/krunner/krunner-4.11.22.ebuild
index f688eadc0ea2b..8fcf80c7c6009 100644
--- a/kde-base/krunner/krunner-4.11.22.ebuild
+++ b/kde-plasma/krunner/krunner-4.11.22.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
-DESCRIPTION="KDE Command Runner"
+DESCRIPTION="KDE Plasma Command Runner"
 HOMEPAGE+=" https://userbase.kde.org/Plasma/Krunner"
 IUSE="debug"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/krunner/metadata.xml b/kde-plasma/krunner/metadata.xml
similarity index 55%
rename from kde-base/krunner/metadata.xml
rename to kde-plasma/krunner/metadata.xml
index 0cf59224b0096..2fdbf33d963db 100644
--- a/kde-base/krunner/metadata.xml
+++ b/kde-plasma/krunner/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
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 df1fc282fe3bc..2f16eb2e0f54b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
@@ -111,7 +111,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
 	!kde-plasma/klipper:4
-	!kde-base/krunner:4
+	!kde-plasma/krunner:4
 	!kde-plasma/ksmserver:4
 	!kde-plasma/ksplash:4
 	!kde-base/plasma-workspace: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 39a8bb340c27c..575fe1182da1c 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
@@ -111,7 +111,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
 	!kde-plasma/klipper:4
-	!kde-base/krunner:4
+	!kde-plasma/krunner:4
 	!kde-plasma/ksmserver:4
 	!kde-plasma/ksplash:4
 	!kde-base/plasma-workspace: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 84227da58edf4..914572361bba9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kcminit:4
 	!kde-base/kdebase-startkde:4
 	!kde-plasma/klipper:4
-	!kde-base/krunner:4
+	!kde-plasma/krunner:4
 	!kde-plasma/ksmserver:4
 	!kde-plasma/ksplash:4
 	!kde-base/plasma-workspace:4
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 3478f37bfe760..9e269f00b736c 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -47,3 +47,4 @@ move kde-base/libtaskmanager kde-plasma/libtaskmanager
 move media-libs/prison kde-frameworks/prison
 move kde-base/klipper kde-plasma/klipper
 move kde-base/ksmserver kde-plasma/ksmserver
+move kde-base/krunner kde-plasma/krunner