diff --git a/x11-toolkits/py-python-xlib/Makefile b/x11-toolkits/py-python-xlib/Makefile
index dd12a9e0e9bc..5f47900c523b 100644
--- a/x11-toolkits/py-python-xlib/Makefile
+++ b/x11-toolkits/py-python-xlib/Makefile
@@ -1,24 +1,24 @@
-PORTNAME=	xlib
-DISTVERSION=	0.27
+PORTNAME=	python-xlib
+DISTVERSION=	0.31
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fax@nohik.ee
 COMMENT=	X11 library for Python
 WWW=		https://github.com/python-xlib/python-xlib
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python:3.6+ tar:bz2
 USE_PYTHON=	autoplist concurrent distutils
+USE_GITHUB=	yes
+GH_ACCOUNT=	python-xlib
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-python-xlib/distinfo b/x11-toolkits/py-python-xlib/distinfo
index 3238b087b641..33d11a42f3f3 100644
--- a/x11-toolkits/py-python-xlib/distinfo
+++ b/x11-toolkits/py-python-xlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591088005
-SHA256 (python-xlib-0.27.tar.bz2) = a90667c70905c6ef0754c8a09fa61acbc1e1b7ddb946d527831800d7cbfe9348
-SIZE (python-xlib-0.27.tar.bz2) = 207119
+TIMESTAMP = 1666681537
+SHA256 (python-xlib-python-xlib-0.31_GH0.tar.gz) = 5484b3a30904bd8efb8bc7af455f93b87c99b779605a07c7c81f607e5254113d
+SIZE (python-xlib-python-xlib-0.31_GH0.tar.gz) = 266042