diff --git a/devel/appstream-qt/Makefile b/devel/appstream-qt/Makefile
index 69f354e4a134..0e787e767259 100644
--- a/devel/appstream-qt/Makefile
+++ b/devel/appstream-qt/Makefile
@@ -1,22 +1,23 @@
+PORTREVISION=	0
 PKGNAMESUFFIX=	Qt
 
 COMMENT?=	Qt bindings to AppStream
 
 LIB_DEPENDS=	libappstream.so:devel/appstream
 
 USES=		qt:5
 
 USE_QT=		core buildtools:build qmake:build testlib:build
 
 MESON_ARGS=	-Dqt=true
 
 MASTERDIR=	${.CURDIR}/../appstream
 PLIST=		${.CURDIR}/pkg-plist
 
 post-install:
 	# remove files belonging to the master port
 	${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% < ${MASTERDIR}/pkg-plist
 	${FIND} ${STAGEDIR}${PREFIX} -empty -delete
 	${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/man
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/devel/appstream/Makefile b/devel/appstream/Makefile
index f4b7c37c3a49..b2107808fcd3 100644
--- a/devel/appstream/Makefile
+++ b/devel/appstream/Makefile
@@ -1,39 +1,46 @@
 # Some knobs are defined with ?= and += to allow them
 # being overriden by devel/appstream-qt slave port
 
 PORTNAME?=	AppStream
 DISTVERSION=	0.16.0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.freedesktop.org/software/${PORTNAME:tl}/releases/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT?=	Machine-readable software metadata for desktop environments
 WWW=		https://www.freedesktop.org/wiki/Distributions/AppStream/
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 		gperf>0:devel/gperf \
 		itstool:textproc/itstool \
 		lmdb>0:databases/lmdb
 LIB_DEPENDS?=	libcurl.so:ftp/curl \
 		liblmdb.so:databases/lmdb \
 		libstemmer.so:textproc/snowballstemmer \
 		libxmlb.so:textproc/libxmlb \
 		libyaml.so:textproc/libyaml
 
 USES+=		gettext gnome localbase:ldflags meson pkgconfig \
 		python:3.6+,build tar:xz vala:build
 
 USE_GNOME=	glib20 introspection:build libxml2 libxslt
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-D__BSD_VISIBLE=1
 MESON_ARGS+=	-Dstemming=true \
 		-Dvapi=true \
 		-Dapidocs=false \
 		-Dinstall-docs=false \
-		-Dsystemd=false \
+		-Dsystemd=false
+
+post-patch:
+	${REINPLACE_CMD} \
+		-e 's|APPLICATIONS_DIR = "/usr/share/applications"|APPLICATIONS_DIR = "${LOCALBASE}/share/applications"|' \
+		-e 's|METAINFO_DIR = "/usr/share/metainfo"|METAINFO_DIR = "${LOCALBASE}/share/metainfo"|' \
+		${WRKSRC}/src/as-pool.c
 
 .include <bsd.port.mk>