diff --git a/x11/Makefile b/x11/Makefile
index a4f1a7984e6..bfcfbfa8769 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.709 2021/05/25 23:03:09 abieber Exp $
+# $OpenBSD: Makefile,v 1.710 2021/07/11 08:05:13 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += 2bwm
@@ -246,7 +246,6 @@
      SUBDIR += py-wxPython
      SUBDIR += py-xcbgen
      SUBDIR += py-xcbgen,python3
-     SUBDIR += py-xlib
      SUBDIR += py-xlib,python3
      SUBDIR += qt4
      SUBDIR += qt5
diff --git a/x11/py-xlib/Makefile b/x11/py-xlib/Makefile
index 0d1e66d37aa..8f8335456c9 100644
--- a/x11/py-xlib/Makefile
+++ b/x11/py-xlib/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.6 2021/07/11 08:05:13 ajacoutot Exp $
 
 COMMENT =	 	X11 library for Python
 
 GH_ACCOUNT =		python-xlib
 GH_PROJECT =		python-xlib
-GH_TAGNAME =		0.25
+GH_TAGNAME =		0.31
 PKGNAME =		py-xlib-${GH_TAGNAME}
-REVISION =		1
 
 CATEGORIES =		x11
 
@@ -24,6 +23,6 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/x11/py-xlib/distinfo b/x11/py-xlib/distinfo
index 1c5a13ce2d5..0c3ffc2010b 100644
--- a/x11/py-xlib/distinfo
+++ b/x11/py-xlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-xlib-0.25.tar.gz) = N2SYFJ4OzHChGzOILaaPxYey9CKisf4NkWn9qLVm0U0=
-SIZE (python-xlib-0.25.tar.gz) = 258842
+SHA256 (python-xlib-0.31.tar.gz) = VISzowkEvY77i8evRV+TuHyZt3lgWgfHyB9gflJUET0=
+SIZE (python-xlib-0.31.tar.gz) = 266042
diff --git a/x11/py-xlib/pkg/PLIST b/x11/py-xlib/pkg/PLIST
index 0e2cd067dc2..2cd818afbcf 100644
--- a/x11/py-xlib/pkg/PLIST
+++ b/x11/py-xlib/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/08/26 12:30:49 mpi Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/07/11 08:05:13 ajacoutot Exp $
+@conflict py-xlib-*
+@pkgpath x11/py-xlib
 lib/python${MODPY_VERSION}/site-packages/Xlib/
 lib/python${MODPY_VERSION}/site-packages/Xlib/X.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/XK.py
@@ -25,10 +27,13 @@ lib/python${MODPY_VERSION}/site-packages/Xlib/ext/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}composite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}damage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}dpms.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}ge.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}nvcontrol.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}randr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}record.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}res.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}security.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}shape.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}xfixes.${MODPY_PYC_MAGIC_TAG}pyc
@@ -36,10 +41,13 @@ lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}xinerama.${MOD
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}xinput.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/${MODPY_PYCACHE}xtest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/composite.py
+lib/python${MODPY_VERSION}/site-packages/Xlib/ext/damage.py
+lib/python${MODPY_VERSION}/site-packages/Xlib/ext/dpms.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/ge.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/nvcontrol.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/randr.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/record.py
+lib/python${MODPY_VERSION}/site-packages/Xlib/ext/res.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/security.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/shape.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/ext/xfixes.py
@@ -133,9 +141,9 @@ lib/python${MODPY_VERSION}/site-packages/Xlib/xobject/drawable.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/xobject/fontable.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/xobject/icccm.py
 lib/python${MODPY_VERSION}/site-packages/Xlib/xobject/resource.py
-lib/python${MODPY_VERSION}/site-packages/python_xlib-0.25-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/python_xlib-0.25-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/python_xlib-0.25-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/python_xlib-0.25-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/python_xlib-0.25-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/python_xlib-0.25-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_xlib-0.31-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/python_xlib-0.31-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/python_xlib-0.31-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/python_xlib-0.31-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/python_xlib-0.31-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/python_xlib-0.31-py${MODPY_VERSION}.egg-info/top_level.txt