diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 37f3f28bb176..ad66a082435b 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -1,49 +1,51 @@
 PORTREVISION=	5	# don't delete, reset to 0
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \
+		${LOCALBASE}/share/automake-1.18/py-compile:devel/automake
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \
 		avahi-gtk3>=0.7:net/avahi-gtk3
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	python
 
 USE_GNOME=	pygobject3 gtk30
 USES=		python
 USE_PYTHON=	flavors py3kplist
 MANPAGES=	avahi-bookmarks.1
 
 NO_ARCH=	yes
 
 # See https://github.com/lathiat/avahi/issues/277
 post-extract:
 	${CP} ${FILESDIR}/build-db ${WRKSRC}/service-type-database
 
 do-build:
+	${CP} ${LOCALBASE}/share/automake-1.18/py-compile ${WRKSRC}/
 	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/service-type-database
 
 do-install:
 	@(cd ${BUILD_WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} install-strip)
 	@(cd ${WRKSRC}/service-type-database; ${MAKE_CMD} ${MAKE_ARGS} install)
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/py-avahi/pkg-plist b/net/py-avahi/pkg-plist
index c62fc06d3dd9..3c8c9bb6268a 100644
--- a/net/py-avahi/pkg-plist
+++ b/net/py-avahi/pkg-plist
@@ -1,11 +1,12 @@
 bin/avahi-bookmarks
 bin/avahi-discover
 lib/avahi/service-types.db
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.py
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyc
 %%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyo
 %%PYTHON_SITELIBDIR%%/avahi/__init__.py
 %%PYTHON_SITELIBDIR%%/avahi/__init__.pyc
 %%PYTHON_SITELIBDIR%%/avahi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/avahi/__pycache__/__init__%%PYTHON_TAG%%.opt-2.pyc
 share/applications/avahi-discover.desktop
 share/man/man1/avahi-bookmarks.1.gz