diff --git a/security/dnssec-tools/Makefile b/security/dnssec-tools/Makefile
index ddf3d2ee24a5..9cdce1709414 100644
--- a/security/dnssec-tools/Makefile
+++ b/security/dnssec-tools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2013/05/31 12:41:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/15 19:57:20 pettai Exp $
 #
 
-DISTNAME=	dnssec-tools-1.12.2
-PKGREVISION=	4
+DISTNAME=	dnssec-tools-1.14
 CATEGORIES=	security
 MASTER_SITES=	http://www.dnssec-tools.org/download/
 
diff --git a/security/dnssec-tools/PLIST b/security/dnssec-tools/PLIST
index d27ef6d6e99a..d98059b7f61a 100644
--- a/security/dnssec-tools/PLIST
+++ b/security/dnssec-tools/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.6 2012/03/18 19:23:27 pettai Exp $
-bin/getaddr
-bin/gethost
-bin/getname
-bin/getquery
-bin/getrrset
+@comment $NetBSD: PLIST,v 1.7 2013/06/15 19:57:20 pettai Exp $
+bin/dt-danechk
+bin/dt-getaddr
+bin/dt-gethost
+bin/dt-getname
+bin/dt-getquery
+bin/dt-getrrset
+bin/dt-validate
 bin/libval-config
 bin/libval_check_conf
-bin/validate
 include/validator/resolver.h
+include/validator/val_dane.h
 include/validator/val_errors.h
 include/validator/validator-compat.h
 include/validator/validator-config.h
@@ -15,14 +17,181 @@ include/validator/validator.h
 lib/libsres.la
 lib/libval-threads.la
 lib/libval_shim.la
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/Donuts/Rule.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Bind.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Csv.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Dns.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Dump.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Itar.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Libval.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Makefile.PL
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Mf.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/SEC/Tools/TrustAnchor/Secspider.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/BootStrap.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/QWPrimitives.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/conf.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/defaults.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/dnssectools.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/keyrec.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/keyrec.pod
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/realm.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/realm.pod
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/realmmgr.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/rolllog.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/rollmgr.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/rollrec.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/rollrec.pod
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/timetrans.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Tools/tooloptions.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/Validator.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/SEC/defines.pl
+${PERL5_SUB_INSTALLVENDORARCH}/Net/DNS/ZoneFile/Fast.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Net/addrinfo.pm
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Tools/Dnspktflow/dnspktflow/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Tools/Donuts/donuts/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Tools/Drawvalmap/drawvalmap/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Tools/Maketestzone/maketestzone/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Tools/Mapper/mapper/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Tools/conf/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Validator/Validator.bs
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/SEC/Validator/Validator.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/addrinfo/addrinfo.bs
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/addrinfo/addrinfo.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/convertar/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/dnssec-tools/.packlist
+${PERL5_SUB_INSTALLVENDORBIN}/blinkenlights
+${PERL5_SUB_INSTALLVENDORBIN}/bubbles
+${PERL5_SUB_INSTALLVENDORBIN}/buildrealms
+${PERL5_SUB_INSTALLVENDORBIN}/check-zone-expiration
+${PERL5_SUB_INSTALLVENDORBIN}/cleanarch
+${PERL5_SUB_INSTALLVENDORBIN}/cleankrf
+${PERL5_SUB_INSTALLVENDORBIN}/convertar
+${PERL5_SUB_INSTALLVENDORBIN}/dnspktflow
+${PERL5_SUB_INSTALLVENDORBIN}/donuts
+${PERL5_SUB_INSTALLVENDORBIN}/donutsd
+${PERL5_SUB_INSTALLVENDORBIN}/drawvalmap
+${PERL5_SUB_INSTALLVENDORBIN}/dtck
+${PERL5_SUB_INSTALLVENDORBIN}/dtconf
+${PERL5_SUB_INSTALLVENDORBIN}/dtconfchk
+${PERL5_SUB_INSTALLVENDORBIN}/dtdefs
+${PERL5_SUB_INSTALLVENDORBIN}/dtinitconf
+${PERL5_SUB_INSTALLVENDORBIN}/dtrealms
+${PERL5_SUB_INSTALLVENDORBIN}/expchk
+${PERL5_SUB_INSTALLVENDORBIN}/fixkrf
+${PERL5_SUB_INSTALLVENDORBIN}/genkrf
+${PERL5_SUB_INSTALLVENDORBIN}/getdnskeys
+${PERL5_SUB_INSTALLVENDORBIN}/getds
+${PERL5_SUB_INSTALLVENDORBIN}/grandvizier
+${PERL5_SUB_INSTALLVENDORBIN}/keyarch
+${PERL5_SUB_INSTALLVENDORBIN}/keymod
+${PERL5_SUB_INSTALLVENDORBIN}/krfcheck
+${PERL5_SUB_INSTALLVENDORBIN}/lights
+${PERL5_SUB_INSTALLVENDORBIN}/lsdnssec
+${PERL5_SUB_INSTALLVENDORBIN}/lskrf
+${PERL5_SUB_INSTALLVENDORBIN}/lsrealm
+${PERL5_SUB_INSTALLVENDORBIN}/lsroll
+${PERL5_SUB_INSTALLVENDORBIN}/maketestzone
+${PERL5_SUB_INSTALLVENDORBIN}/mapper
+${PERL5_SUB_INSTALLVENDORBIN}/realmchk
+${PERL5_SUB_INSTALLVENDORBIN}/realmctl
+${PERL5_SUB_INSTALLVENDORBIN}/realminit
+${PERL5_SUB_INSTALLVENDORBIN}/realmset
+${PERL5_SUB_INSTALLVENDORBIN}/rollchk
+${PERL5_SUB_INSTALLVENDORBIN}/rollctl
+${PERL5_SUB_INSTALLVENDORBIN}/rollerd
+${PERL5_SUB_INSTALLVENDORBIN}/rollinit
+${PERL5_SUB_INSTALLVENDORBIN}/rolllog
+${PERL5_SUB_INSTALLVENDORBIN}/rollrec-editor
+${PERL5_SUB_INSTALLVENDORBIN}/rollset
+${PERL5_SUB_INSTALLVENDORBIN}/signset-editor
+${PERL5_SUB_INSTALLVENDORBIN}/tachk
+${PERL5_SUB_INSTALLVENDORBIN}/timetrans
+${PERL5_SUB_INSTALLVENDORBIN}/trustman
+${PERL5_SUB_INSTALLVENDORBIN}/zonesigner
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/blinkenlights.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/bubbles.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/buildrealms.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/check-zone-expiration.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/cleanarch.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/cleankrf.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/convertar.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/dnspktflow.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/donuts.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/donutsd.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/drawvalmap.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/dtck.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/dtconf.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/dtconfchk.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/dtdefs.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/dtinitconf.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/dtrealms.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/expchk.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/fixkrf.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/genkrf.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/getdnskeys.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/getds.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/grandvizier.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/keyarch.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/keymod.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/krfcheck.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/lights.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/lsdnssec.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/lskrf.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/lsrealm.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/lsroll.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/maketestzone.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/mapper.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/realmchk.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/realmctl.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/realminit.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/realmset.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/rollchk.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/rollctl.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/rollerd.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/rollinit.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/rolllog.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/rollrec-editor.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/rollset.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/signset-editor.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/tachk.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/timetrans.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/trustman.1
+${PERL5_SUB_INSTALLVENDORMAN1DIR}/zonesigner.1
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::BootStrap.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::Donuts::Rule.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::QWPrimitives.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Bind.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Csv.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Dns.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Dump.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Itar.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Libval.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Mf.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::TrustAnchor::Secspider.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::conf.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::defaults.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::dnssectools.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::keyrec.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::realm.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::realmmgr.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::rolllog.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::rollmgr.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::rollrec.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::timetrans.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Tools::tooloptions.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::SEC::Validator.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::DNS::ZoneFile::Fast.3
+${PERL5_SUB_INSTALLVENDORMAN3DIR}/Net::addrinfo.3
 man/man1/dnssec-tools.1
-man/man1/getaddr.1
-man/man1/gethost.1
-man/man1/getname.1
-man/man1/getquery.1
-man/man1/getrrset.1
-man/man1/libval_check_conf.1
-man/man1/validate.1
+man/man1/dt-getaddr.1
+man/man1/dt-gethost.1
+man/man1/dt-getname.1
+man/man1/dt-getquery.1
+man/man1/dt-getrrset.1
+man/man1/dt-libval_check_conf.1
+man/man1/dt-validate.1
 man/man3/dnsval.conf.3
 man/man3/dnsval_conf_get.3
 man/man3/dnsval_conf_set.3
@@ -67,3 +236,4 @@ share/dnssec-tools/donuts/rules/recommendations.rules.txt
 share/examples/dnssec-tools/dnsval.conf
 share/examples/dnssec-tools/resolv.conf
 share/examples/dnssec-tools/root.hints
+@pkgdir etc/dnssec-tools
diff --git a/security/dnssec-tools/distinfo b/security/dnssec-tools/distinfo
index 531397c93cd7..d0fbe978dfd8 100644
--- a/security/dnssec-tools/distinfo
+++ b/security/dnssec-tools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2013/04/01 12:21:54 joerg Exp $
+$NetBSD: distinfo,v 1.10 2013/06/15 19:57:20 pettai Exp $
 
-SHA1 (dnssec-tools-1.12.2.tar.gz) = e9912249fae3ec6bd5ad4ee1d73dea28acbefd0d
-RMD160 (dnssec-tools-1.12.2.tar.gz) = 2a077c2ef74a4d0427932d8a806cdc32e185211a
-Size (dnssec-tools-1.12.2.tar.gz) = 3140018 bytes
-SHA1 (patch-aa) = cf0f806152bf912d9e6d727f66bdb186ec2f55c7
-SHA1 (patch-ab) = 07b5a0dbbca1c41cbb30b19f5a94ec9f8c900c15
+SHA1 (dnssec-tools-1.14.tar.gz) = 8e72cabf345614136ea99af24dd2d90d4b16a71d
+RMD160 (dnssec-tools-1.14.tar.gz) = bc1a988f37608ac84d33fb18aa8e873e4c085071
+Size (dnssec-tools-1.14.tar.gz) = 3337126 bytes
+SHA1 (patch-aa) = 873486ab64c3aaf68996d1eef9b3def28cb8fdbc
+SHA1 (patch-ab) = 2351dc0d1011071e4ada5e3cf276e9a3338f1167
 SHA1 (patch-tools_donuts_Makefile.PL) = 283447b2e1ac4a83f462743ef2a397c3a29b87a1
 SHA1 (patch-validator_libsres_res__debug.c) = a22fd334c6a8ff095bb01c2d2631d2045373d62e
diff --git a/security/dnssec-tools/patches/patch-aa b/security/dnssec-tools/patches/patch-aa
index cec86ad4cbcf..c56619300b6e 100644
--- a/security/dnssec-tools/patches/patch-aa
+++ b/security/dnssec-tools/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/07/22 21:08:26 pettai Exp $
+$NetBSD: patch-aa,v 1.2 2013/06/15 19:57:20 pettai Exp $
+
+Add (PKG_)PREFIX support
 
 --- Makefile.in.orig	2010-06-30 14:51:12.000000000 +0000
 +++ Makefile.in
diff --git a/security/dnssec-tools/patches/patch-ab b/security/dnssec-tools/patches/patch-ab
index 01bf0d5b9751..7aec9bf6704c 100644
--- a/security/dnssec-tools/patches/patch-ab
+++ b/security/dnssec-tools/patches/patch-ab
@@ -1,10 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/07/22 21:08:26 pettai Exp $
+$NetBSD: patch-ab,v 1.2 2013/06/15 19:57:20 pettai Exp $
 
---- validator/apps/Makefile.in.orig	2010-07-18 17:14:45.000000000 +0000
+Don't install configuration files etc.
+
+--- validator/apps/Makefile.in.orig	2012-09-24 21:57:17.000000000 +0000
 +++ validator/apps/Makefile.in
-@@ -74,4 +74,4 @@ install:
- 	$(LIBTOOLIN) $(GETNAME) $(DESTDIR)/$(bindir)	
- 	$(LIBTOOLIN) $(CHECK_CONF) $(DESTDIR)/$(bindir)	
- 	$(MKPATH) `echo $(DESTDIR)/@VALIDATOR_TESTCASES@ | sed 's#/[^/]*$$##'`
--	$(CP) selftests.dist $(DESTDIR)/@VALIDATOR_TESTCASES@
-+	#$(CP) selftests.dist $(DESTDIR)/@VALIDATOR_TESTCASES@
+@@ -90,4 +90,4 @@ install:
+ 	$(LIBTOOLIN) $(CHECK_CONF) $(DESTDIR)$(bindir)
+ 	$(LIBTOOLIN) $(DANECHK) $(DESTDIR)$(bindir)
+ 	$(MKPATH) `echo $(DESTDIR)@VALIDATOR_TESTCASES@ | sed 's#/[^/]*$$##'`
+-	$(CP) selftests.dist $(DESTDIR)@VALIDATOR_TESTCASES@
++	#$(CP) selftests.dist $(DESTDIR)@VALIDATOR_TESTCASES@