diff --git a/app-doc/devmanual/devmanual-0_pre20141116.ebuild b/app-doc/devmanual/devmanual-0_pre20141116.ebuild
index e891efa24f236..15b7afe991b43 100644
--- a/app-doc/devmanual/devmanual-0_pre20141116.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20141116.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,12 +55,12 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
-	if ! has_version app-portage/eclass-manpages; then
+	if ! has_version app-doc/eclass-manpages; then
 		elog "The offline version of the devmanual does not include the"
 		elog "documentation for the eclasses. If you need it, then emerge"
 		elog "the following package:"
 		elog
-		elog "app-portage/eclass-manpages"
+		elog "app-doc/eclass-manpages"
 		elog
 	fi
 }
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index e891efa24f236..15b7afe991b43 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,12 +55,12 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
-	if ! has_version app-portage/eclass-manpages; then
+	if ! has_version app-doc/eclass-manpages; then
 		elog "The offline version of the devmanual does not include the"
 		elog "documentation for the eclasses. If you need it, then emerge"
 		elog "the following package:"
 		elog
-		elog "app-portage/eclass-manpages"
+		elog "app-doc/eclass-manpages"
 		elog
 	fi
 }
diff --git a/app-portage/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
similarity index 100%
rename from app-portage/eclass-manpages/Manifest
rename to app-doc/eclass-manpages/Manifest
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180812.ebuild b/app-doc/eclass-manpages/eclass-manpages-20180812.ebuild
similarity index 100%
rename from app-portage/eclass-manpages/eclass-manpages-20180812.ebuild
rename to app-doc/eclass-manpages/eclass-manpages-20180812.ebuild
diff --git a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
similarity index 100%
rename from app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
rename to app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-doc/eclass-manpages/files/eclass-to-manpage.awk
similarity index 100%
rename from app-portage/eclass-manpages/files/eclass-to-manpage.awk
rename to app-doc/eclass-manpages/files/eclass-to-manpage.awk
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/app-doc/eclass-manpages/files/eclass-to-manpage.sh
similarity index 91%
rename from app-portage/eclass-manpages/files/eclass-to-manpage.sh
rename to app-doc/eclass-manpages/files/eclass-to-manpage.sh
index 5f389390d60ee..55d25aaaf4d3b 100755
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.sh
+++ b/app-doc/eclass-manpages/files/eclass-to-manpage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 : ${ECLASSDIR:=${0%/*}/../../../eclass}
-: ${FILESDIR:=${ECLASSDIR}/../app-portage/eclass-manpages/files}
+: ${FILESDIR:=${0%/*}}
 
 AWK="gawk"
 while [[ $# -gt 0 ]] ; do
diff --git a/app-portage/eclass-manpages/metadata.xml b/app-doc/eclass-manpages/metadata.xml
similarity index 100%
rename from app-portage/eclass-manpages/metadata.xml
rename to app-doc/eclass-manpages/metadata.xml
diff --git a/profiles/updates/1Q-2019 b/profiles/updates/1Q-2019
index fe1bf9e5ef5a2..10ac282f20d6c 100644
--- a/profiles/updates/1Q-2019
+++ b/profiles/updates/1Q-2019
@@ -12,3 +12,4 @@ move net-misc/networkmanager-strongswan net-vpn/networkmanager-strongswan
 move net-misc/networkmanager-vpnc net-vpn/networkmanager-vpnc
 move net-misc/networkmanager-sstp net-vpn/networkmanager-sstp
 move gnome-extra/gnome-tweak-tool gnome-extra/gnome-tweaks
+move app-portage/eclass-manpages app-doc/eclass-manpages