diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 87adc05399f8..9f5e137c5859 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -1,57 +1,54 @@
 # NOTE: please keep zeitgeist in sysutils/qzeitgeist in sync
 
 PORTNAME=	zeitgeist
 DISTVERSION=	1.0.4
 PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Event logging framework
 WWW=		http://zeitgeist.freedesktop.org/
 
-BROKEN=		plist issues, stray python bytecode files
-
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	dee-tool:devel/dee \
 		rapper:textproc/raptor2 \
 		${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib@${PY_FLAVOR}
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-pyxdg@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR}
 
 USES=		autoreconf gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig \
 		python sqlite tar:xz vala:build
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_TAGNAME=	8b89364c077b46734d193c5b8a80f83b0fc917dd
 USE_GNOME=	cairo gdkpixbuf glib20 intlhack \
 		introspection:build
 USE_LDCONFIG=	yes
-USE_PYTHON=	py3kplist
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-fts --disable-telepathy \
 		--disable-downloads-monitor
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DATAHUB
 OPTIONS_DEFAULT=DATAHUB
 
 DATAHUB_DESC=	Passive loggers for Zeitgeist
 
 DATAHUB_LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 DATAHUB_USE=	gnome=gtk30
 DATAHUB_CONFIGURE_ENABLE=	datahub
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/zeitgeist/pkg-plist b/sysutils/zeitgeist/pkg-plist
index 4ad940c71d2f..b068963b1745 100644
--- a/sysutils/zeitgeist/pkg-plist
+++ b/sysutils/zeitgeist/pkg-plist
@@ -1,45 +1,45 @@
 bin/zeitgeist-daemon
 %%DATAHUB%%bin/zeitgeist-datahub
 %%DATAHUB%%etc/xdg/autostart/zeitgeist-datahub.desktop
 include/zeitgeist-2.0/zeitgeist-datamodel.h
 include/zeitgeist-2.0/zeitgeist.h
 lib/girepository-1.0/Zeitgeist-2.0.typelib
 lib/libzeitgeist-2.0.so
 lib/libzeitgeist-2.0.so.0
 lib/libzeitgeist-2.0.so.0.0.0
 %%PYTHON_SITELIBDIR%%/zeitgeist/__init__.py
-%%PYTHON_SITELIBDIR%%/zeitgeist/__init__.pyc
-%%PYTHON_SITELIBDIR%%/zeitgeist/__init__.pyo
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/_ontology%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/_ontology%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/client%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/client%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/datamodel%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/datamodel%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/mimetypes%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/__pycache__/mimetypes%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.py
-%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.pyc
-%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.pyo
 %%PYTHON_SITELIBDIR%%/zeitgeist/client.py
-%%PYTHON_SITELIBDIR%%/zeitgeist/client.pyc
-%%PYTHON_SITELIBDIR%%/zeitgeist/client.pyo
 %%PYTHON_SITELIBDIR%%/zeitgeist/datamodel.py
-%%PYTHON_SITELIBDIR%%/zeitgeist/datamodel.pyc
-%%PYTHON_SITELIBDIR%%/zeitgeist/datamodel.pyo
 %%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.py
-%%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.pyc
-%%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.pyo
 @comment lib/systemd/user/zeitgeist.service
 libdata/pkgconfig/zeitgeist-2.0.pc
 share/man/man1/zeitgeist-daemon.1.gz
 %%DATAHUB%%share/man/man1/zeitgeist-datahub.1.gz
 share/bash-completion/completions/zeitgeist-daemon
 share/dbus-1/services/org.gnome.zeitgeist.Engine.service
 share/gir-1.0/Zeitgeist-2.0.gir
 share/vala/vapi/zeitgeist-2.0.deps
 share/vala/vapi/zeitgeist-2.0.vapi
 share/vala/vapi/zeitgeist-datamodel-2.0.vapi
 %%DATADIR%%/doc/AUTHORS
 %%DATADIR%%/doc/NEWS
 %%DATADIR%%/doc/README.md
 %%DATADIR%%/ontology/nao.trig
 %%DATADIR%%/ontology/ncal.trig
 %%DATADIR%%/ontology/nco.trig
 %%DATADIR%%/ontology/nfo.trig
 %%DATADIR%%/ontology/nie.trig
 %%DATADIR%%/ontology/nmm.trig
 %%DATADIR%%/ontology/nmo.trig
 %%DATADIR%%/ontology/zg.trig