diff --git a/sysutils/ohmu/Makefile b/sysutils/ohmu/Makefile
index 8b4c4e5b9246..bddb134ba768 100644
--- a/sysutils/ohmu/Makefile
+++ b/sysutils/ohmu/Makefile
@@ -1,26 +1,29 @@
 PORTNAME=	ohmu
-PORTVERSION=	1.1.0
-PORTREVISION=	6
-DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.0
+PORTREVISION=	7
 CATEGORIES=	sysutils
+MASTER_SITES=	PYPI
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to view space usage in your terminal
 WWW=		https://gitlab.com/paul-nechifor/ohmu
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR}
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	paul-nechifor
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils concurrent optsuffix
+USE_PYTHON=	autoplist concurrent optsuffix pep517
+
 NO_ARCH=	yes
 
-pre-configure:
-	${REINPLACE_CMD} -e 's/future==0.15.2/future>=0.15.2/' \
-		${WRKSRC}/setup.py
+post-patch:
+	@${REINPLACE_CMD} -e '/^from past\.builtins import basestring$$/d' \
+		-e 's/isinstance(\([^,]*\), basestring)/isinstance(\1, str)/g' \
+		${WRKSRC}/ohmu/utils.py ${WRKSRC}/ohmu/test_fs.py
+	@${REINPLACE_CMD} -e '/^from builtins import range$$/d' \
+		${WRKSRC}/ohmu/views.py
+	@${REINPLACE_CMD} -e '/future==0.15.2/d' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/sysutils/ohmu/distinfo b/sysutils/ohmu/distinfo
index 9af9b960efdf..1fb6496a6186 100644
--- a/sysutils/ohmu/distinfo
+++ b/sysutils/ohmu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479237782
-SHA256 (paul-nechifor-ohmu-v1.1.0_GH0.tar.gz) = 3181f2da0a58e4f096118bd07b7314e809c578e4af0f79e65e9dfad171bbf1ad
-SIZE (paul-nechifor-ohmu-v1.1.0_GH0.tar.gz) = 1723252
+TIMESTAMP = 1785035836
+SHA256 (ohmu-1.1.0.tar.gz) = d017f683e7c5ea6428bd847c987e892fe1d9e9afc645809ce03b81fc528758f0
+SIZE (ohmu-1.1.0.tar.gz) = 9139