diff --git a/dev-python/dbutils/dbutils-1.3.ebuild b/dev-python/dbutils/dbutils-1.3.ebuild
index 40b10864236c0..197c5d0c0d57e 100644
--- a/dev-python/dbutils/dbutils-1.3.ebuild
+++ b/dev-python/dbutils/dbutils-1.3.ebuild
@@ -13,8 +13,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
-	https://cito.github.io/DBUtils/
-	https://github.com/Cito/DBUtils
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/dbutils/dbutils-2.0.ebuild b/dev-python/dbutils/dbutils-2.0.ebuild
index 13bce71b251bf..d230f6c0ea6d6 100644
--- a/dev-python/dbutils/dbutils-2.0.ebuild
+++ b/dev-python/dbutils/dbutils-2.0.ebuild
@@ -13,8 +13,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
-	https://cito.github.io/DBUtils/
-	https://github.com/Cito/DBUtils
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
index a24feb91917fe..5f3a181b8872a 100644
--- a/dev-python/dbutils/metadata.xml
+++ b/dev-python/dbutils/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription lang="en">
-DBUtils is a suite of tools providing solid, persistent and pooled connections
-to a database that can be used in all kinds of multi-threaded environments
-like Webware for Python or other web application servers. The suite supports
-DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">Cito/DBUtils</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		DBUtils is a suite of tools providing solid, persistent and pooled connections
+		to a database that can be used in all kinds of multi-threaded environments
+		like Webware for Python or other web application servers. The suite supports
+		DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">WebwareForPython/DBUtils</remote-id>
+		<remote-id type="pypi">DBUtils</remote-id>
+	</upstream>
 </pkgmetadata>