diff --git a/net/ldns/Makefile.inc b/net/ldns/Makefile.inc
index afe5b3dc8e7..2c57bbb4976 100644
--- a/net/ldns/Makefile.inc
+++ b/net/ldns/Makefile.inc
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile.inc,v 1.5 2009/02/10 19:24:42 jakob Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2009/07/15 22:13:45 jakob Exp $
 
-VERSION=	1.5.1
+VERSION=	1.6.0
 
 DISTNAME=	ldns-${VERSION}
 
diff --git a/net/ldns/drill/Makefile b/net/ldns/drill/Makefile
index ac5fc85969b..c5a7db91701 100644
--- a/net/ldns/drill/Makefile
+++ b/net/ldns/drill/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2009/02/10 19:24:43 jakob Exp $
+# $OpenBSD: Makefile,v 1.9 2009/07/15 22:13:45 jakob Exp $
 
 COMMENT=	DNS debugger
 
 PKGNAME=	drill-${VERSION}
 
 WANTLIB=	c crypto
-LIB_DEPENDS+=	ldns.>=2.2::net/ldns/libldns
+LIB_DEPENDS+=	ldns.>=3.0::net/ldns/libldns
 
 WRKSRC=		${WRKDIST}/drill
 
diff --git a/net/ldns/drill/distinfo b/net/ldns/drill/distinfo
index 677c1f474cf..9a522cdc391 100644
--- a/net/ldns/drill/distinfo
+++ b/net/ldns/drill/distinfo
@@ -1,5 +1,5 @@
-MD5 (ldns-1.5.1.tar.gz) = F/c975hxHhR1QJ2ajV2dzQ==
-RMD160 (ldns-1.5.1.tar.gz) = AswzEEHeCWEk7HZgHBGbl9skoaU=
-SHA1 (ldns-1.5.1.tar.gz) = BwIQpBdjO3NYuzRm2kDm8YcvNsI=
-SHA256 (ldns-1.5.1.tar.gz) = 8GcvDv1vMoWFjx+UCm3oB/BKMDEZ07xLgJX7yIpvH6o=
-SIZE (ldns-1.5.1.tar.gz) = 781562
+MD5 (ldns-1.6.0.tar.gz) = zQ1NNKYNAY+/7a5tPuQEmw==
+RMD160 (ldns-1.6.0.tar.gz) = yXYjzuV22yGQlyggjclSBwkSx/o=
+SHA1 (ldns-1.6.0.tar.gz) = 5f28XNZvavxPgW6azTNL3cSI6DA=
+SHA256 (ldns-1.6.0.tar.gz) = /xSlpSxh7DISs+Nf3Z8IYXBaZvzrHO+L1HILlQtWlOc=
+SIZE (ldns-1.6.0.tar.gz) = 824644
diff --git a/net/ldns/libldns/Makefile b/net/ldns/libldns/Makefile
index 64ac93278ed..5a09f855e43 100644
--- a/net/ldns/libldns/Makefile
+++ b/net/ldns/libldns/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2009/05/18 09:21:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2009/07/15 22:13:45 jakob Exp $
 
 COMMENT=	DNS library modelled after Net::DNS
 
-PKGNAME=	libldns-${VERSION}p0
+PKGNAME=	libldns-${VERSION}
 
-SHARED_LIBS +=	ldns 2.2
+SHARED_LIBS +=	ldns 3.0
 
 WANTLIB=	crypto
 
diff --git a/net/ldns/libldns/distinfo b/net/ldns/libldns/distinfo
index 677c1f474cf..9a522cdc391 100644
--- a/net/ldns/libldns/distinfo
+++ b/net/ldns/libldns/distinfo
@@ -1,5 +1,5 @@
-MD5 (ldns-1.5.1.tar.gz) = F/c975hxHhR1QJ2ajV2dzQ==
-RMD160 (ldns-1.5.1.tar.gz) = AswzEEHeCWEk7HZgHBGbl9skoaU=
-SHA1 (ldns-1.5.1.tar.gz) = BwIQpBdjO3NYuzRm2kDm8YcvNsI=
-SHA256 (ldns-1.5.1.tar.gz) = 8GcvDv1vMoWFjx+UCm3oB/BKMDEZ07xLgJX7yIpvH6o=
-SIZE (ldns-1.5.1.tar.gz) = 781562
+MD5 (ldns-1.6.0.tar.gz) = zQ1NNKYNAY+/7a5tPuQEmw==
+RMD160 (ldns-1.6.0.tar.gz) = yXYjzuV22yGQlyggjclSBwkSx/o=
+SHA1 (ldns-1.6.0.tar.gz) = 5f28XNZvavxPgW6azTNL3cSI6DA=
+SHA256 (ldns-1.6.0.tar.gz) = /xSlpSxh7DISs+Nf3Z8IYXBaZvzrHO+L1HILlQtWlOc=
+SIZE (ldns-1.6.0.tar.gz) = 824644
diff --git a/net/ldns/libldns/patches/patch-Makefile_in b/net/ldns/libldns/patches/patch-Makefile_in
index 412a725607c..e8f2fcd4995 100644
--- a/net/ldns/libldns/patches/patch-Makefile_in
+++ b/net/ldns/libldns/patches/patch-Makefile_in
@@ -1,16 +1,16 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2008/11/09 19:03:18 jakob Exp $
---- Makefile.in.orig	Wed Aug 20 16:38:39 2008
-+++ Makefile.in	Mon Nov  3 19:51:22 2008
+$OpenBSD: patch-Makefile_in,v 1.4 2009/07/15 22:13:45 jakob Exp $
+--- Makefile.in.orig	Fri Jul  3 08:43:18 2009
++++ Makefile.in	Mon Jul 13 03:12:45 2009
 @@ -13,7 +13,7 @@ datarootdir	= @datarootdir@
  datadir		= @datadir@
  libdir		= @libdir@
  includedir	= @includedir@
 -doxygen		= @doxygen@
 +#doxygen		= @doxygen@
- glibtool	= @glibtool@
+ glibtool	= @libtool@
  libtool		= ./libtool
  ifdef glibtool
-@@ -155,7 +155,6 @@ uninstall-h:
+@@ -166,7 +166,6 @@ uninstall-h:
  install-lib:	lib
  		$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
  		$(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir)
diff --git a/net/ldns/libldns/patches/patch-configure b/net/ldns/libldns/patches/patch-configure
index 205cfb75a0a..b57e72c742f 100644
--- a/net/ldns/libldns/patches/patch-configure
+++ b/net/ldns/libldns/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2009/02/10 19:24:43 jakob Exp $
---- configure.orig	Mon Feb  9 17:20:49 2009
-+++ configure	Mon Feb  9 18:41:37 2009
-@@ -11825,7 +11825,7 @@ openbsd*)
+$OpenBSD: patch-configure,v 1.5 2009/07/15 22:13:45 jakob Exp $
+--- configure.orig	Thu Jul  9 05:45:03 2009
++++ configure	Mon Jul 13 03:12:15 2009
+@@ -12954,7 +12954,7 @@ openbsd*)
      *)				need_version=no  ;;
    esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
diff --git a/net/ldns/libldns/patches/patch-util_c b/net/ldns/libldns/patches/patch-util_c
index dccb1a668c1..9a6150cf071 100644
--- a/net/ldns/libldns/patches/patch-util_c
+++ b/net/ldns/libldns/patches/patch-util_c
@@ -1,8 +1,8 @@
-$OpenBSD: patch-util_c,v 1.1 2009/05/18 09:21:57 sthen Exp $
---- util.c.orig	Mon May 18 09:45:00 2009
-+++ util.c	Mon May 18 09:45:14 2009
+$OpenBSD: patch-util_c,v 1.2 2009/07/15 22:13:45 jakob Exp $
+--- util.c.orig	Thu Jul  2 05:25:00 2009
++++ util.c	Mon Jul 13 03:12:15 2009
 @@ -273,7 +273,7 @@ ldns_init_random(FILE *fd, unsigned int size) 
- 	seed = LDNS_XMALLOC(unsigned int, size);
+ 	seed = LDNS_XMALLOC(uint8_t, size);
  
  	if (!fd) {
 -		if ((rand_f = fopen("/dev/urandom", "r")) == NULL) {
diff --git a/net/ldns/libldns/pkg/PLIST b/net/ldns/libldns/pkg/PLIST
index d8a699cb2cc..3a8d1755d24 100644
--- a/net/ldns/libldns/pkg/PLIST
+++ b/net/ldns/libldns/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/06/03 15:03:10 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/07/15 22:13:45 jakob Exp $
 @conflict ldns-*
 %%SHARED%%
+bin/ldns-config
 include/ldns/
 include/ldns/buffer.h
 include/ldns/common.h
@@ -23,6 +24,8 @@ include/ldns/rdata.h
 include/ldns/resolver.h
 include/ldns/rr.h
 include/ldns/rr_functions.h
+include/ldns/sha1.h
+include/ldns/sha2.h
 include/ldns/str2host.h
 include/ldns/tsig.h
 include/ldns/update.h
diff --git a/net/ldns/utils/Makefile b/net/ldns/utils/Makefile
index 24e2558362d..6234566ccb8 100644
--- a/net/ldns/utils/Makefile
+++ b/net/ldns/utils/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2009/02/10 19:24:43 jakob Exp $
+# $OpenBSD: Makefile,v 1.8 2009/07/15 22:13:45 jakob Exp $
 
 COMMENT=	LDNS utilities
 
 PKGNAME=	ldns-utils-${VERSION}
 
 WANTLIB=	c crypto pcap
-LIB_DEPENDS+=	ldns.>=2.2::net/ldns/libldns
+LIB_DEPENDS+=	ldns.>=3.0::net/ldns/libldns
 
 WRKSRC=		${WRKDIST}/examples
 
diff --git a/net/ldns/utils/distinfo b/net/ldns/utils/distinfo
index 677c1f474cf..9a522cdc391 100644
--- a/net/ldns/utils/distinfo
+++ b/net/ldns/utils/distinfo
@@ -1,5 +1,5 @@
-MD5 (ldns-1.5.1.tar.gz) = F/c975hxHhR1QJ2ajV2dzQ==
-RMD160 (ldns-1.5.1.tar.gz) = AswzEEHeCWEk7HZgHBGbl9skoaU=
-SHA1 (ldns-1.5.1.tar.gz) = BwIQpBdjO3NYuzRm2kDm8YcvNsI=
-SHA256 (ldns-1.5.1.tar.gz) = 8GcvDv1vMoWFjx+UCm3oB/BKMDEZ07xLgJX7yIpvH6o=
-SIZE (ldns-1.5.1.tar.gz) = 781562
+MD5 (ldns-1.6.0.tar.gz) = zQ1NNKYNAY+/7a5tPuQEmw==
+RMD160 (ldns-1.6.0.tar.gz) = yXYjzuV22yGQlyggjclSBwkSx/o=
+SHA1 (ldns-1.6.0.tar.gz) = 5f28XNZvavxPgW6azTNL3cSI6DA=
+SHA256 (ldns-1.6.0.tar.gz) = /xSlpSxh7DISs+Nf3Z8IYXBaZvzrHO+L1HILlQtWlOc=
+SIZE (ldns-1.6.0.tar.gz) = 824644