diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
index baa1f7e6f7dd..a0c210e66744 100644
--- a/dns/opendnssec2/Makefile
+++ b/dns/opendnssec2/Makefile
@@ -1,93 +1,93 @@
 PORTNAME=	opendnssec
 DISTVERSION=	2.1.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 WWW=		https://www.opendnssec.org
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
 LIB_DEPENDS=	libldns.so:dns/ldns \
 		libxml2.so:textproc/libxml2
 
 USES=		autoreconf cpe libtool ssl
 USE_RC_SUBR=	opendnssec
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var" \
 		--with-ssl=${OPENSSLBASE}
 
 INSTALL_TARGET=	install-strip
 
 CONFLICTS=	opendnssec-1.[0-4]*
 
 SUB_FILES=	pkg-message
 
 USERS=		opendnssec
 GROUPS=		opendnssec
 
 PORTDOCS=	MIGRATION NEWS README.md
 MIGRATE=	README.md find_problematic_zones.sql convert_mysql \
 		mysql_convert.sql convert_sqlite sqlite_convert.sql
 CONVERT=	convert_mysql_to_sqlite convert_sqlite_to_mysql
 SCHEMAS=	schema.mysql schema.sqlite
 
 OPTIONS_DEFINE=		DOCS SOFTHSM
 OPTIONS_DEFAULT=	SQLITE
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL SQLITE
 OPTIONS_SUB=		yes
 
 MYSQL_DESC=	Use MYSQL backend
 SOFTHSM_DESC=	SoftHSM cryptographic store for PKCS \#11 interface
 SQLITE_DESC=	Use SQLite backend
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-enforcer-database=mysql
 MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 SOFTHSM_RUN_DEPENDS=	softhsm2>=2.5.0:security/softhsm2
 SOFTHSM_CONFIGURE_ON=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm2.so
 SQLITE_BUILD_DEPENDS=	sqlite3>=3.3.9:databases/sqlite3
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-enforcer-database=sqlite3
 
 pre-build:
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/configure
 
 pre-install-MYSQL-on:
 	${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' \
 		${WRKDIR}/opendnssec
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
 	${INSTALL_DATA} ${MIGRATE:S|^|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/|} \
 		${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
 	${INSTALL_DATA} ${CONVERT:S|^|${WRKSRC}/enforcer/utils/|} \
 		${STAGEDIR}${DOCSDIR}
 	${REINPLACE_CMD} -e 's|enforcer/utils/|${DOCSDIR}/|' \
 		${STAGEDIR}${DOCSDIR}/MIGRATION
 	${INSTALL_DATA} ${SCHEMAS:S|^|${WRKSRC}/enforcer/src/db/|} \
 		${STAGEDIR}${DOCSDIR}
 	${REINPLACE_CMD} -e 's|../src/db/schema|${DOCSDIR}/schema|' \
 		-e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		${STAGEDIR}${DOCSDIR}/convert_*
 	${REINPLACE_CMD} -e 's|../../src/db/schema|${DOCSDIR}/schema|' \
 		-e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert/convert_*
 
 .include <bsd.port.mk>
diff --git a/dns/opendnssec2/files/opendnssec.in b/dns/opendnssec2/files/opendnssec.in
index da22ac4628a4..180fd07776ae 100644
--- a/dns/opendnssec2/files/opendnssec.in
+++ b/dns/opendnssec2/files/opendnssec.in
@@ -1,54 +1,55 @@
 #!/bin/sh
 
 # PROVIDE: opendnssec
 # REQUIRE: LOGIN DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable opendnssec:
 #
 # opendnssec_enable="YES"
 
 ODS_CONTROL=%%PREFIX%%/sbin/ods-control
 
 . /etc/rc.subr
 
 name=opendnssec
 rcvar=opendnssec_enable
 
 load_rc_config $name
 
 opendnssec_enable=${opendnssec_enable:-"NO"}
+: ${opendnssec_svcj_options:="net_basic"}
 
 start_cmd="${name}_run start"
 stop_cmd="${name}_run stop"
 restart_cmd="${name}_restart"
 status_cmd="${name}_status"
 reload_cmd="${name}_reload"
 extra_commands="reload status"
 
 opendnssec_run()
 {
     $ODS_CONTROL $1
 }
 
 opendnssec_restart()
 {
     $ODS_CONTROL stop
     $ODS_CONTROL start
 }
 
 opendnssec_reload()
 {
     echo "OpenDNSSEC reloading:"
     echo -n "  Signer  : "; $ODS_CONTROL signer reload
     echo -n "  Enforcer: "; $ODS_CONTROL enforcer reload
 }
 
 opendnssec_status()
 {
     echo "OpenDNSSEC status:"
     echo -n "  Signer  : "; $ODS_CONTROL signer running
     echo -n "  Enforcer: "; $ODS_CONTROL enforcer running
 }
 
 run_rc_command "$1"