diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
index 6ac4249cf59a..16085e07a169 100644
--- a/dns/opendnssec2/Makefile
+++ b/dns/opendnssec2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.6
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 PKGNAMESUFFIX=	2
diff --git a/dns/opendnssec2/distinfo b/dns/opendnssec2/distinfo
index f347802f2e1a..1fe9a2735efc 100644
--- a/dns/opendnssec2/distinfo
+++ b/dns/opendnssec2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558098992
-SHA256 (opendnssec-2.1.4.tar.gz) = 77e85e417d1067a5e4529b636248875a9e2d1925d5e90f022449007e59d6a293
-SIZE (opendnssec-2.1.4.tar.gz) = 1119991
+TIMESTAMP = 1581416801
+SHA256 (opendnssec-2.1.6.tar.gz) = b2c0caa673b8cfef73585dedf276997f5ca69bb3d523ce4e080f70dfcb23c56c
+SIZE (opendnssec-2.1.6.tar.gz) = 1122405
diff --git a/dns/opendnssec2/files/opendnssec.in b/dns/opendnssec2/files/opendnssec.in
index 63320707366d..2f16ecdd0439 100644
--- a/dns/opendnssec2/files/opendnssec.in
+++ b/dns/opendnssec2/files/opendnssec.in
@@ -10,6 +10,8 @@
 #
 # opendnssec_enable="YES"
 
+ODS_CONTROL=%%PREFIX%%/sbin/ods-control
+
 . /etc/rc.subr
 
 name=opendnssec
@@ -21,13 +23,34 @@ opendnssec_enable=${opendnssec_enable:-"NO"}
 
 start_cmd="${name}_run start"
 stop_cmd="${name}_run stop"
-extra_commands="reload ksm hsm signer enforcer"
-
-procname=${opendnssec_procname}
+restart_cmd="${name}_restart"
+status_cmd="${name}_status"
+reload_cmd="${name}_reload"
+extra_commands="reload status"
 
 opendnssec_run()
 {
-    %%PREFIX%%/sbin/ods-control $1
+    $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"