diff --git a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
index bf09f7cabfea3..eeca23d3292bd 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="http://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
index d4ca2562952ac..c57b96514b095 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index 871d8dcb64ded..b972ab35c0bc7 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5} pypy)
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1