diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
deleted file mode 100644
index 166ed064c52d3..0000000000000
--- a/kde-base/kdeplasma-addons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdeplasma-addons-4.14.3.tar.xz 1791328 SHA256 12d58e30362729473db208c0650676dac0fdae8b3f223ce92e8df41e3e928f24 SHA512 e4382aa1aab27ddcdecdd53ca0d931b9d53d27dfe4b53736642e1e030ac940ee6909029d7ddb865ee13567facb4e380d3c23601b9ea985151fccba8860077925 WHIRLPOOL 13b3a9f6706bbdda6ab4010aedbb1da4f677de771e3bd5f7c6dc2074db413860ea26bbeae919b7927e31116f535f51ef67ada1d2aa3b368ca4df23f4146a4165
diff --git a/kde-base/kdeplasma-addons/metadata.xml b/kde-base/kdeplasma-addons/metadata.xml
deleted file mode 100644
index ccc57e5f2bdc8..0000000000000
--- a/kde-base/kdeplasma-addons/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>
-	<use>
-		<flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag>
-		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
-		<flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-apps/marble</pkg></flag>
-		<flag name="eigen">Build Mandelbrot wallpaper plugin using <pkg>dev-cpp/eigen</pkg> using SLOT 2</flag>
-		<flag name="fcitx">Use fcitx input method via <pkg>app-i18n/fcitx</pkg></flag>
-		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
-		<flag name="kdepim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
-		<flag name="oauth">Enable OAuth support via <pkg>dev-libs/qoauth</pkg></flag>
-		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
-		<flag name="qwt">Enable applets that use <pkg>x11-libs/qwt</pkg> SLOT 5</flag>
-		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/kde-frameworks/plasma/plasma-5.26.0.ebuild b/kde-frameworks/plasma/plasma-5.26.0.ebuild
index fe9ddafa37120..e873949d49a94 100644
--- a/kde-frameworks/plasma/plasma-5.26.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.26.0.ebuild
@@ -51,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kapptemplate-15.08.3-r1:5
-	!<kde-plasma/kdeplasma-addons-5.4.3-r1
+	!<kde-plasma/kdeplasma-addons-5.4.3-r1:5
 "
 
 RESTRICT+=" test"
diff --git a/kde-frameworks/plasma/plasma-5.27.0.ebuild b/kde-frameworks/plasma/plasma-5.27.0.ebuild
index ddce084d64d5b..c0ad25e496d32 100644
--- a/kde-frameworks/plasma/plasma-5.27.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.27.0.ebuild
@@ -51,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kapptemplate-15.08.3-r1:5
-	!<kde-plasma/kdeplasma-addons-5.4.3-r1
+	!<kde-plasma/kdeplasma-addons-5.4.3-r1:5
 "
 
 RESTRICT+=" test"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 3b5b309e3bc44..2243afda46150 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,3 @@
+DIST kdeplasma-addons-4.14.3.tar.xz 1791328 SHA256 12d58e30362729473db208c0650676dac0fdae8b3f223ce92e8df41e3e928f24 SHA512 e4382aa1aab27ddcdecdd53ca0d931b9d53d27dfe4b53736642e1e030ac940ee6909029d7ddb865ee13567facb4e380d3c23601b9ea985151fccba8860077925 WHIRLPOOL 13b3a9f6706bbdda6ab4010aedbb1da4f677de771e3bd5f7c6dc2074db413860ea26bbeae919b7927e31116f535f51ef67ada1d2aa3b368ca4df23f4146a4165
 DIST kdeplasma-addons-5.7.5.tar.xz 2077476 SHA256 0066badd4c3a76d31946ea0824124c9efd5c05f073672e5123e70f9a155c1613 SHA512 3e3376a3ed19c0965a918ae939903cb99da89af9e18c0e6fa25518d4d6464f34ec84895d6aea3d78594c82b4978194fef8142166c5a788212ca8e8f801cf6b62 WHIRLPOOL 8841f86d20110b2e98220963b87c38a528969bd7c6f0a70d596d828a10e5c64159d8876607b0446941966cce79d7ee63484523d1614e355e1475da0af5413142
 DIST kdeplasma-addons-5.8.3.tar.xz 2073968 SHA256 63220c0b7301eb44ef3e96d4f1a7085b340a0bd49884d26b52237eb7333853eb SHA512 7a2f8cb3995b8e0499fed35cea5a1b8fbbb745e3695fedd57e719014adf1b75a785cb1287e386f6f9a38731d816079117839c5a6c8f9e938b9a466305f74bb26 WHIRLPOOL 4eccb2e7cdbf5c310210afc94111c0d8e7c10ecf94a800163a4ce8f3bb71fcd822f966d4b1c5c10ead8812b44779a55904e6e50412914e985bfa57dfb3627040
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
similarity index 100%
rename from kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.7.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.7.5.ebuild
index ab9d8e0d961b2..22a44a349717f 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.7.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.7.5.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep plasma-workspace)
-	!kde-base/kdeplasma-addons:4
+	!kde-plasma/kdeplasma-addons:4
 "
 
 src_configure() {
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.3.ebuild
index 705a14c81d89f..e77661b8b5517 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.3.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.3.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep plasma-workspace)
-	!kde-base/kdeplasma-addons:4
+	!kde-plasma/kdeplasma-addons:4
 "
 
 src_configure() {
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index fc6c01ae834a0..3c65517d074e0 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -6,6 +6,17 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag>
+		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
+		<flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-apps/marble</pkg></flag>
+		<flag name="eigen">Build Mandelbrot wallpaper plugin using <pkg>dev-cpp/eigen</pkg> using SLOT 2</flag>
+		<flag name="fcitx">Use fcitx input method via <pkg>app-i18n/fcitx</pkg></flag>
+		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
+		<flag name="kdepim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
+		<flag name="oauth">Enable OAuth support via <pkg>dev-libs/qoauth</pkg></flag>
+		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
+		<flag name="qwt">Enable applets that use <pkg>x11-libs/qwt</pkg> SLOT 5</flag>
+		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
 		<flag name="share">Enable applet for quickly sharing data to a variety of sources</flag>
 	</use>
 </pkgmetadata>
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 8456f6be5e65b..c5bbc850c0425 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -425,7 +425,7 @@ app-accessibility/speech-dispatcher flite
 # mask kde-base/* flags due to unkeyworded dependencies
 kde-apps/kalzium editor solver
 kde-apps/kopete jingle
-kde-base/kdeplasma-addons fcitx oauth
+kde-plasma/kdeplasma-addons fcitx oauth
 kde-apps/kstars indi
 kde-apps/kdeutils-meta floppy
 kde-apps/kdenetwork-meta ppp
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index a65d8903e6828..4d5c59bedf7fd 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -165,7 +165,7 @@ app-accessibility/speech-dispatcher flite
 kde-apps/kalzium editor solver
 kde-apps/krdc rdesktop
 kde-apps/kopete jingle msn
-kde-base/kdeplasma-addons fcitx oauth qwt scim
+kde-plasma/kdeplasma-addons fcitx oauth qwt scim
 kde-apps/okular ebook chm
 kde-apps/kstars indi
 kde-apps/kdeutils-meta floppy
diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask
index 4c065bea73f95..92b6262a3b3e6 100644
--- a/profiles/arch/nios2/package.use.mask
+++ b/profiles/arch/nios2/package.use.mask
@@ -153,7 +153,7 @@ app-accessibility/speech-dispatcher flite
 kde-apps/kalzium editor solver
 kde-apps/krdc rdesktop
 kde-apps/kopete jingle msn
-kde-base/kdeplasma-addons fcitx oauth qwt scim
+kde-plasma/kdeplasma-addons fcitx oauth qwt scim
 kde-apps/okular ebook chm
 kde-apps/kstars indi
 kde-apps/kdeutils-meta floppy
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 5ac29d1cf864f..21eef192f9ac4 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -6,3 +6,4 @@ move kde-misc/plasma-nm kde-plasma/plasma-nm
 slotmove app-office/akonadi-server 0 4
 move app-office/akonadi-server kde-apps/akonadi
 move net-wireless/bluedevil kde-plasma/bluedevil
+move kde-base/kdeplasma-addons kde-plasma/kdeplasma-addons