diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index 245690678e..97382a7754 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1 +1 @@
-DIST oslo-upgradecheck-1.1.1.tar.gz 15096 BLAKE2B 7aac69c8078d8f6e89c16801fc61bf9d44811b2333ed67d4f2b8a9e432dd8ecb1f90010b796965e838267991a16c0f5b19f25afc98cbb6458906e3af656f91da SHA512 89b7fca8a95195081e83b336d3e55a9c67802ff3b88fbb5849afa7c7424212c03c3a96a916a6a62bcab18ac002f73ab7a4dcc92859e6bcc9b4002798756040b2
+DIST oslo-upgradecheck-1.4.0.tar.gz 19487 BLAKE2B 6731ace45abc39dc751717ca61a59800a1a07e710c2afcdf1ab9225597b5b33ab4195cb7eae3eed1bab30dc7fda60926192d1edcfd2cf2c41a4c754ccb376966 SHA512 ce53c01a6e144788c16f36af74d4593e850631c4552560e36ac17b1583d966ba2df83dc4a4251a81ccb35363935688b1d901de718e2149dd86473cdcc2570961
diff --git a/dev-python/oslo-upgradecheck/metadata.xml b/dev-python/oslo-upgradecheck/metadata.xml
index 1a20badb4f..fe6ee74a49 100644
--- a/dev-python/oslo-upgradecheck/metadata.xml
+++ b/dev-python/oslo-upgradecheck/metadata.xml
@@ -8,6 +8,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<bugs-to>https://bugs.launchpad.net/oslo.upgradecheck</bugs-to>
 		<remote-id type="pypi">oslo.upgradecheck</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
 	</upstream>
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
deleted file mode 100644
index a20e0f654a..0000000000
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.4.0.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.4.0.ebuild
new file mode 100644
index 0000000000..67228435f8
--- /dev/null
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+MY_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Common code for writing OpenStack upgrade checks"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.upgradecheck
+	https://pypi.org/project/oslo.upgradecheck
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-2.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-3.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-serialization-2.21.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest