diff --git a/dev-python/ghp-import/Manifest b/dev-vcs/ghp-import/Manifest
similarity index 100%
rename from dev-python/ghp-import/Manifest
rename to dev-vcs/ghp-import/Manifest
diff --git a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild b/dev-vcs/ghp-import/ghp-import-0.4.1-r1.ebuild
similarity index 100%
rename from dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
rename to dev-vcs/ghp-import/ghp-import-0.4.1-r1.ebuild
diff --git a/dev-python/ghp-import/metadata.xml b/dev-vcs/ghp-import/metadata.xml
similarity index 100%
rename from dev-python/ghp-import/metadata.xml
rename to dev-vcs/ghp-import/metadata.xml
diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020
index aaf723d85f23d..320d898c20720 100644
--- a/profiles/updates/1Q-2020
+++ b/profiles/updates/1Q-2020
@@ -5,3 +5,5 @@ move dev-python/matplotlib2tikz dev-python/tikzplotlib
 move dev-python/pep257 dev-python/pydocstyle
 move dev-python/pyzor mail-filter/pyzor
 move dev-python/python-sqlparse dev-python/sqlparse
+move dev-python/ghp-import dev-vcs/ghp-import
+move app-doc/ghp-import dev-vcs/ghp-import
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 2980224965be4..929eafbf40bf6 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -14,7 +14,7 @@
     </flag>
     <flag name="ghpages">
       Add support for direct uploading to github pages thru
-      <pkg>dev-python/ghp-import</pkg>
+      <pkg>dev-vcs/ghp-import</pkg>
     </flag>
     <flag name="hyphenation">
       Add hyphenation support through <pkg>dev-python/pyphen</pkg>
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
index dcb3f7b73e3d5..fc0f51979b563 100644
--- a/www-apps/nikola/nikola-7.8.15-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
index c3e5967f02292..45305104ec884 100644
--- a/www-apps/nikola/nikola-7.8.15.ebuild
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
 	ipython? (
 		$(python_gen_cond_dep '
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
index b6ae1963ef8b8..903eb3874a758 100644
--- a/www-apps/nikola/nikola-8.0.4.ebuild
+++ b/www-apps/nikola/nikola-8.0.4.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )