diff --git a/dev-python/nagiosplugin/metadata.xml b/dev-python/nagiosplugin/metadata.xml
index 56b0f256a4b07..7f6a93a550229 100644
--- a/dev-python/nagiosplugin/metadata.xml
+++ b/dev-python/nagiosplugin/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">nagiosplugin</remote-id>
-		<remote-id type="bitbucket">flyingcircus/nagiosplugin</remote-id>
-		<bugs-to>https://bitbucket.org/flyingcircus/nagiosplugin/issues</bugs-to>
+		<remote-id type="github">mpounsett/nagiosplugin</remote-id>
+		<bugs-to>https://github.com/mpounsett/nagiosplugin/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
index db0af6ad3e581..3d5a2c4be07d7 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="A class library for writing nagios-compatible plugins"
-HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.org/project/nagiosplugin/"
+HOMEPAGE="https://github.com/mpounsett/nagiosplugin https://nagiosplugin.readthedocs.io"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"