diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
index 71d2a86a8dd7..2135b9ecc663 100644
--- a/devel/py-dbus/pkg-plist
+++ b/devel/py-dbus/pkg-plist
@@ -1,56 +1,53 @@
 %%PYTHON_SITELIBDIR%%/_dbus_bindings.so
 %%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so
 %%PYTHON_SITELIBDIR%%/dbus/__init__.py
-%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/_compat%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/_compat%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/_dbus%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/_dbus%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/_expat_introspect_parser%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/_expat_introspect_parser%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/bus%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/bus%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/connection%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/connection%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/decorators%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/decorators%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/exceptions%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/exceptions%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/gi_service%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/gi_service%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/glib%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/glib%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/lowlevel%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/lowlevel%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/proxies%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/proxies%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/server%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/server%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/service%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/service%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/types%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__pycache__/types%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/dbus/_compat.py
-%%PYTHON_SITELIBDIR%%/dbus/_compat.pyc
-%%PYTHON_SITELIBDIR%%/dbus/_compat.pyo
 %%PYTHON_SITELIBDIR%%/dbus/_dbus.py
-%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc
-%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo
 %%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py
-%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc
-%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo
 %%PYTHON_SITELIBDIR%%/dbus/bus.py
-%%PYTHON_SITELIBDIR%%/dbus/bus.pyc
-%%PYTHON_SITELIBDIR%%/dbus/bus.pyo
 %%PYTHON_SITELIBDIR%%/dbus/connection.py
-%%PYTHON_SITELIBDIR%%/dbus/connection.pyc
-%%PYTHON_SITELIBDIR%%/dbus/connection.pyo
 %%PYTHON_SITELIBDIR%%/dbus/decorators.py
-%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc
-%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo
 %%PYTHON_SITELIBDIR%%/dbus/exceptions.py
-%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo
 %%PYTHON_SITELIBDIR%%/dbus/gi_service.py
-%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyc
-%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyo
 %%PYTHON_SITELIBDIR%%/dbus/glib.py
-%%PYTHON_SITELIBDIR%%/dbus/glib.pyc
-%%PYTHON_SITELIBDIR%%/dbus/glib.pyo
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyo
 %%PYTHON_SITELIBDIR%%/dbus/lowlevel.py
-%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc
-%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo
 %%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.py
-%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__pycache__/glib%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dbus/mainloop/__pycache__/glib%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.py
-%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyc
-%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyo
 %%PYTHON_SITELIBDIR%%/dbus/proxies.py
-%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc
-%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo
 %%PYTHON_SITELIBDIR%%/dbus/server.py
-%%PYTHON_SITELIBDIR%%/dbus/server.pyc
-%%PYTHON_SITELIBDIR%%/dbus/server.pyo
 %%PYTHON_SITELIBDIR%%/dbus/service.py
-%%PYTHON_SITELIBDIR%%/dbus/service.pyc
-%%PYTHON_SITELIBDIR%%/dbus/service.pyo
 %%PYTHON_SITELIBDIR%%/dbus/types.py
-%%PYTHON_SITELIBDIR%%/dbus/types.pyc
-%%PYTHON_SITELIBDIR%%/dbus/types.pyo
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
index 318ee2c2d900..dd6f9f68554c 100644
--- a/devel/pydbus-common/Makefile
+++ b/devel/pydbus-common/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	dbus
 DISTVERSION=	1.3.2
 PORTREVISION?=	0
 CATEGORIES=	devel gnome python
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
 PKGNAMEPREFIX?=	py
 PKGNAMESUFFIX?=	-common
 DISTNAME=	dbus-python-${PORTVERSION}
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT?=	Common files for the Python bindings for the D-BUS messaging system
 WWW=		https://dbus.freedesktop.org/doc/dbus-python/
 
 BUILD_DEPENDS=	dbus-glib>=0:devel/dbus-glib
 
 SLAVE_PORT?=	no
 
 USES=		gettext gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${PYTHON_INCLUDEDIR}
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--disable-api-docs
 INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == no
 USES+=		python:build
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	HTMLDOCS DOCS EXAMPLES
 HTMLDOCS_DESC=	build html documentation
 HTMLDOCS_IMPLIES=	DOCS
 HTMLDOCS_CONFIGURE_ENABLE=	documentation
 HTMLDOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx \
 				${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
 		s|PYTHON install-nodist_docDATA|PYTHON|g' \
 			${WRKSRC}/Makefile.in
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/
 	${INSTALL_DATA} ${WRKSRC}/include/dbus/dbus-python.h \
 		${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h
 	${INSTALL_DATA} ${WRKSRC}/dbus-python.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
 
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \
 		${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 		${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} && \
 		${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} && \
 		${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 
 do-install-HTMLDOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${STAGEDIR}${DOCSDIR}
 
 .else # slave is defined
 LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib
 RUN_DEPENDS+=	pydbus-common>=0:devel/pydbus-common
 USE_LDCONFIG=	yes
 USES+=		python
-USE_PYTHON=	flavors py3kplist
+USE_PYTHON=	flavors
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/dbus-1.0 \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
 	@${RM} -r ${STAGEDIR}/${DOCSDIR}
 .endif # end of slaving block
 
 .include <bsd.port.mk>