diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index b913cbb..fa39fed 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -9,18 +9,11 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
 
+USES=		python
 USE_GNOME=	libxml2:build
+USE_PYTHON=	py3kplist
 XORG_CAT=	proto
-USES=		python
 
 DATADIR=	${PREFIX}/share/xcb
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_MAJOR_VER} == 3
-PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX} PY3="" PY2="@comment "
-.else
-PLIST_SUB+=	PY2="" PY3="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index baff4f1..e3751a7 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -22,9 +22,9 @@ libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/xf86dri.xml
 %%DATADIR%%/xf86vidmode.xml
 %%DATADIR%%/xfixes.xml
-%%DATADIR%%/xkb.xml
 %%DATADIR%%/xinerama.xml
 %%DATADIR%%/xinput.xml
+%%DATADIR%%/xkb.xml
 %%DATADIR%%/xprint.xml
 %%DATADIR%%/xproto.xml
 %%DATADIR%%/xselinux.xml
@@ -32,32 +32,20 @@ libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/xv.xml
 %%DATADIR%%/xvmc.xml
 %%PYTHON_SITELIBDIR%%/xcbgen/__init__.py
+%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/error.py
+%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/expr.py
+%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/matcher.py
+%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/state.py
+%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
-%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyo
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo