diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index 0b82644d22c4..08096de79f81 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -1,83 +1,84 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 # $FreeBSD$
 
 PORTNAME=	opendnssec
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
 LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
 
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	opendnssec
 USE_GNOME=	libxml2
 USES=		perl5
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
 CONFLICTS=	opendnssec-1.[0-3]*
 
 USERS=		opendnssec
 GROUPS=		opendnssec
 
 PORTDOCS=	KNOWN_ISSUES MIGRATION NEWS README.md
 
 OPTIONS_DEFINE=		SOFTHSM
 OPTIONS_SUB=		yes
 
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL SQLITE
 OPTIONS_DEFAULT=	MYSQL
 
 SOFTHSM_DESC=		SoftHSM cryptographic store for PKCS \#11 interface
 
 MYSQL_DESC=		Use MYSQL backend
 SQLITE_DESC=		Use SQLite backend
 
 SQLITE_USE=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 CONFIGURE_ARGS+=	--with-database-backend=mysql
 USE_MYSQL=	compat
-PORTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
+SCRIPTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
 		migrate_zone_delete.mysql migrate_id_mysql.pl migrate_to_ng_mysql.pl
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
-PORTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
+SCRIPTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
 		migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl
 .endif
 
 .if ${PORT_OPTIONS:MSOFTHSM}
 CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/libsofthsm.so
 RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
 .endif
 
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
 pre-install:
 .if ${PORT_OPTIONS:MMYSQL}
 	@${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 		@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
-	${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${SCRIPTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR}
 #	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
 
 .include <bsd.port.mk>
diff --git a/dns/opendnssec/pkg-plist b/dns/opendnssec/pkg-plist
index e6e71e58874a..e4c0edf824c6 100644
--- a/dns/opendnssec/pkg-plist
+++ b/dns/opendnssec/pkg-plist
@@ -1,57 +1,65 @@
 bin/ods-hsmspeed
 bin/ods-hsmutil
 bin/ods-kaspcheck
 bin/ods-ksmutil
 bin/ods-kasp2html
-@unexec if cmp -s %D/etc/opendnssec/addns.xml %D/etc/opendnssec/addns.xml.sample; then rm -f %D/etc/opendnssec/addns.xml; fi
-%%ETCDIR%%/addns.xml.sample
-@unexec if cmp -s %D/etc/opendnssec/conf.xml %D/etc/opendnssec/conf.xml.sample; then rm -f %D/etc/opendnssec/conf.xml; fi
-%%ETCDIR%%/conf.xml.sample
-@unexec if cmp -s %D/etc/opendnssec/kasp.xml %D/etc/opendnssec/kasp.xml.sample; then rm -f %D/etc/opendnssec/kasp.xml; fi
-%%ETCDIR%%/kasp.xml.sample
-@unexec if cmp -s %D/etc/opendnssec/zonelist.xml %D/etc/opendnssec/zonelist.xml.sample; then rm -f %D/etc/opendnssec/zonelist.xml; fi
-%%ETCDIR%%/zonelist.xml.sample
+@sample %%ETCDIR%%/addns.xml.sample
+@sample %%ETCDIR%%/conf.xml.sample
+@sample %%ETCDIR%%/kasp.xml.sample
+@sample %%ETCDIR%%/zonelist.xml.sample
 sbin/ods-control
 sbin/ods-enforcerd
 sbin/ods-signer
 sbin/ods-signerd
 %%DATADIR%%/addns.rnc
 %%DATADIR%%/addns.rng
 %%DATADIR%%/conf.rnc
 %%DATADIR%%/conf.rng
 %%SQLITE%%%%DATADIR%%/database_create.sqlite3
 %%MYSQL%%%%DATADIR%%/database_create.mysql
 %%DATADIR%%/enforcerstate.rnc
 %%DATADIR%%/enforcerstate.rng
 %%DATADIR%%/kasp.rnc
 %%DATADIR%%/kasp.rng
 %%DATADIR%%/kasp2html.xsl
+%%SQLITE%%%%DATADIR%%/migrate_adapters_1.sqlite3
+%%SQLITE%%%%DATADIR%%/migrate_keyshare_sqlite3.pl
+%%SQLITE%%%%DATADIR%%/migrate_to_ng_sqlite.pl
+%%MYSQL%%%%DATADIR%%/migrate_adapters_1.mysql
+%%MYSQL%%%%DATADIR%%/migrate_keyshare_mysql.pl
+%%MYSQL%%%%DATADIR%%/migrate_zone_delete.mysql
+%%MYSQL%%%%DATADIR%%/migrate_id_mysql.pl
+%%MYSQL%%%%DATADIR%%/migrate_to_ng_mysql.pl
 %%DATADIR%%/signconf.rnc
 %%DATADIR%%/signconf.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
 man/man1/ods-hsmspeed.1.gz
 man/man1/ods-hsmutil.1.gz
 man/man1/ods-ksmutil.1.gz
 man/man1/ods-kaspcheck.1.gz
 man/man5/ods-timing.5.gz
 man/man7/opendnssec.7.gz
 man/man8/ods-control.8.gz
 man/man8/ods-enforcerd.8.gz
 man/man8/ods-signer.8.gz
 man/man8/ods-signerd.8.gz
-@exec chown opendnssec:opendnssec %D/var/opendnssec/unsigned
-@exec chown opendnssec:opendnssec %D/var/opendnssec/tmp
-@exec chown opendnssec:opendnssec %D/var/opendnssec/signed
-@exec chown opendnssec:opendnssec %D/var/opendnssec/signconf
-@dirrm var/opendnssec
+@owner opendnssec
+@group opendnssec
+@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/unsigned
+@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/tmp
+@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signed
+@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signconf
 @dirrm var/opendnssec/unsigned
 @dirrm var/opendnssec/tmp
 @dirrm var/opendnssec/signed
 @dirrm var/opendnssec/signconf
 @dirrm var/opendnssec
+@owner root
+@group wheel
 @dirrm %%DATADIR%%
 @dirrm %%ETCDIR%%
+@exec mkdir -p %D/var/run/opendnssec
 @dirrmtry var/run/opendnssec
 @dirrmtry var/run
 @dirrmtry var