diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
index 9b092d28275b..84194fc48ef8 100644
--- a/dns/opendnssec2/Makefile
+++ b/dns/opendnssec2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 PKGNAMESUFFIX=	2
@@ -35,6 +34,8 @@ 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=		SOFTHSM DOCS
 OPTIONS_SUB=		yes
@@ -73,5 +74,23 @@ post-install-DOCS-on:
 	${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}/shema|' \
+		-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}/shema|' \
+		-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/distinfo b/dns/opendnssec2/distinfo
index 28008b92c40c..503c32e8c2c3 100644
--- a/dns/opendnssec2/distinfo
+++ b/dns/opendnssec2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476788283
-SHA256 (opendnssec-2.0.3.tar.gz) = ebeb5481d696cf83c21c5dfbecce6ab5dcc73df1a08573ef257f2f6fe10f6214
-SIZE (opendnssec-2.0.3.tar.gz) = 1103355
+TIMESTAMP = 1488196887
+SHA256 (opendnssec-2.1.0.tar.gz) = 0ec6094fd4cded58bcff872b251f1b004876b67c6650c38a4875018a18e38545
+SIZE (opendnssec-2.1.0.tar.gz) = 1109051
diff --git a/dns/opendnssec2/pkg-plist b/dns/opendnssec2/pkg-plist
index 1b42598173c9..cbf12f40d4dc 100644
--- a/dns/opendnssec2/pkg-plist
+++ b/dns/opendnssec2/pkg-plist
@@ -2,7 +2,6 @@ bin/ods-hsmspeed
 bin/ods-hsmutil
 bin/ods-kasp2html
 bin/ods-kaspcheck
-bin/ods-ksmutil
 @sample %%ETCDIR%%/addns.xml.sample
 @sample %%ETCDIR%%/conf.xml.sample
 @sample %%ETCDIR%%/kasp.xml.sample
@@ -10,7 +9,6 @@ bin/ods-ksmutil
 man/man1/ods-hsmspeed.1.gz
 man/man1/ods-hsmutil.1.gz
 man/man1/ods-kaspcheck.1.gz
-man/man1/ods-ksmutil.1.gz
 man/man5/ods-kasp.5.gz
 man/man5/ods-timing.5.gz
 man/man7/opendnssec.7.gz
@@ -33,6 +31,10 @@ sbin/ods-signerd
 %%PORTDOCS%%%%DOCSDIR%%/1.4-2.0_db_convert/find_problematic_zones.sql
 %%PORTDOCS%%%%DOCSDIR%%/1.4-2.0_db_convert/mysql_convert.sql
 %%PORTDOCS%%%%DOCSDIR%%/1.4-2.0_db_convert/sqlite_convert.sql
+%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/convert_mysql_to_sqlite
+%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/convert_sqlite_to_mysql
+%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql
+%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/schema.sqlite
 %%DATADIR%%/addns.rnc
 %%DATADIR%%/addns.rng
 %%DATADIR%%/conf.rnc