diff --git a/net/ldns/Makefile.inc b/net/ldns/Makefile.inc
index bd05e6dd68d..99bc452a8ca 100644
--- a/net/ldns/Makefile.inc
+++ b/net/ldns/Makefile.inc
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile.inc,v 1.2 2008/06/03 15:03:10 jakob Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2008/11/09 19:03:18 jakob Exp $
 
-VERSION=	1.3.0
+VERSION=	1.4.0
 
 DISTNAME=	ldns-${VERSION}
 
 CATEGORIES=	net
 
-MASTER_SITES=	http://www.nlnetlabs.nl/downloads/
+MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/
 HOMEPAGE=	http://www.nlnetlabs.nl/ldns/
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
diff --git a/net/ldns/drill/Makefile b/net/ldns/drill/Makefile
index 26782404a17..91d80c436c8 100644
--- a/net/ldns/drill/Makefile
+++ b/net/ldns/drill/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2008/06/03 19:41:27 okan Exp $
+# $OpenBSD: Makefile,v 1.4 2008/11/09 19:03:18 jakob Exp $
 
 COMMENT=	DNS debugger
 
-PKGNAME=	drill-${VERSION}p0
+PKGNAME=	drill-${VERSION}
 
 WANTLIB=	c crypto pcap
 LIB_DEPENDS+=	ldns.>=1.0::net/ldns/libldns
diff --git a/net/ldns/drill/distinfo b/net/ldns/drill/distinfo
index 18bb5109de3..a03251c5b3c 100644
--- a/net/ldns/drill/distinfo
+++ b/net/ldns/drill/distinfo
@@ -1,5 +1,5 @@
-MD5 (ldns-1.3.0.tar.gz) = h7go9hFUPP1KSwOoEYAkDg==
-RMD160 (ldns-1.3.0.tar.gz) = XWAwGPLHchCMNpbB6QOYrqIKBb8=
-SHA1 (ldns-1.3.0.tar.gz) = mwXqOuI/lzNF3omTbFmtefd67M8=
-SHA256 (ldns-1.3.0.tar.gz) = hRhcvL3/7nzTgYT6w8PrCrShYx9dD1CXuHifJqlCueI=
-SIZE (ldns-1.3.0.tar.gz) = 786124
+MD5 (ldns-1.4.0.tar.gz) = OvC3ISIq+ou/vm2yK0vmEw==
+RMD160 (ldns-1.4.0.tar.gz) = beG+eaCAzNAmUrLToXQDyW0RbFI=
+SHA1 (ldns-1.4.0.tar.gz) = L7GzF8y4j2ihDYuQ69cfF0/FoGU=
+SHA256 (ldns-1.4.0.tar.gz) = 0mBZK7Hd+BTANhtzHNpZsZho0Bf2sJAKer9VmmwOh4k=
+SIZE (ldns-1.4.0.tar.gz) = 807484
diff --git a/net/ldns/libldns/distinfo b/net/ldns/libldns/distinfo
index 18bb5109de3..a03251c5b3c 100644
--- a/net/ldns/libldns/distinfo
+++ b/net/ldns/libldns/distinfo
@@ -1,5 +1,5 @@
-MD5 (ldns-1.3.0.tar.gz) = h7go9hFUPP1KSwOoEYAkDg==
-RMD160 (ldns-1.3.0.tar.gz) = XWAwGPLHchCMNpbB6QOYrqIKBb8=
-SHA1 (ldns-1.3.0.tar.gz) = mwXqOuI/lzNF3omTbFmtefd67M8=
-SHA256 (ldns-1.3.0.tar.gz) = hRhcvL3/7nzTgYT6w8PrCrShYx9dD1CXuHifJqlCueI=
-SIZE (ldns-1.3.0.tar.gz) = 786124
+MD5 (ldns-1.4.0.tar.gz) = OvC3ISIq+ou/vm2yK0vmEw==
+RMD160 (ldns-1.4.0.tar.gz) = beG+eaCAzNAmUrLToXQDyW0RbFI=
+SHA1 (ldns-1.4.0.tar.gz) = L7GzF8y4j2ihDYuQ69cfF0/FoGU=
+SHA256 (ldns-1.4.0.tar.gz) = 0mBZK7Hd+BTANhtzHNpZsZho0Bf2sJAKer9VmmwOh4k=
+SIZE (ldns-1.4.0.tar.gz) = 807484
diff --git a/net/ldns/libldns/patches/patch-Makefile_in b/net/ldns/libldns/patches/patch-Makefile_in
index 306cd40a7a6..412a725607c 100644
--- a/net/ldns/libldns/patches/patch-Makefile_in
+++ b/net/ldns/libldns/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2008/06/03 15:03:10 jakob Exp $
---- Makefile.in.orig	Wed May 28 08:12:29 2008
-+++ Makefile.in	Tue Jun  3 16:38:20 2008
+$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
 @@ -13,7 +13,7 @@ datarootdir	= @datarootdir@
  datadir		= @datadir@
  libdir		= @libdir@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2008/06/03 15:03:10 jakob Exp $
  glibtool	= @glibtool@
  libtool		= ./libtool
  ifdef glibtool
-@@ -149,7 +149,6 @@ uninstall-h:
+@@ -155,7 +155,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 6b3227b1cd9..72e95ec3d3d 100644
--- a/net/ldns/libldns/patches/patch-configure
+++ b/net/ldns/libldns/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.1 2008/06/03 15:03:10 jakob Exp $
---- configure.orig	Mon Jun  2 14:46:14 2008
-+++ configure	Tue Jun  3 16:39:00 2008
-@@ -9538,7 +9538,7 @@ openbsd*)
+$OpenBSD: patch-configure,v 1.2 2008/11/09 19:03:18 jakob Exp $
+--- configure.orig	Thu Oct 30 13:42:53 2008
++++ configure	Mon Nov  3 19:51:22 2008
+@@ -9827,7 +9827,7 @@ openbsd*)
    need_lib_prefix=no
    need_version=yes
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
diff --git a/net/ldns/utils/Makefile b/net/ldns/utils/Makefile
index 2b805d2f44f..134cbd3b91b 100644
--- a/net/ldns/utils/Makefile
+++ b/net/ldns/utils/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2008/06/03 19:41:27 okan Exp $
+# $OpenBSD: Makefile,v 1.4 2008/11/09 19:03:18 jakob Exp $
 
 COMMENT=	LDNS utilities
 
-PKGNAME=	ldns-utils-${VERSION}p0
+PKGNAME=	ldns-utils-${VERSION}
 
 WANTLIB=	c crypto pcap
 LIB_DEPENDS+=	ldns.>=1.0::net/ldns/libldns
diff --git a/net/ldns/utils/distinfo b/net/ldns/utils/distinfo
index 18bb5109de3..a03251c5b3c 100644
--- a/net/ldns/utils/distinfo
+++ b/net/ldns/utils/distinfo
@@ -1,5 +1,5 @@
-MD5 (ldns-1.3.0.tar.gz) = h7go9hFUPP1KSwOoEYAkDg==
-RMD160 (ldns-1.3.0.tar.gz) = XWAwGPLHchCMNpbB6QOYrqIKBb8=
-SHA1 (ldns-1.3.0.tar.gz) = mwXqOuI/lzNF3omTbFmtefd67M8=
-SHA256 (ldns-1.3.0.tar.gz) = hRhcvL3/7nzTgYT6w8PrCrShYx9dD1CXuHifJqlCueI=
-SIZE (ldns-1.3.0.tar.gz) = 786124
+MD5 (ldns-1.4.0.tar.gz) = OvC3ISIq+ou/vm2yK0vmEw==
+RMD160 (ldns-1.4.0.tar.gz) = beG+eaCAzNAmUrLToXQDyW0RbFI=
+SHA1 (ldns-1.4.0.tar.gz) = L7GzF8y4j2ihDYuQ69cfF0/FoGU=
+SHA256 (ldns-1.4.0.tar.gz) = 0mBZK7Hd+BTANhtzHNpZsZho0Bf2sJAKer9VmmwOh4k=
+SIZE (ldns-1.4.0.tar.gz) = 807484
diff --git a/net/ldns/utils/pkg/PLIST b/net/ldns/utils/pkg/PLIST
index adfb1eec3bb..2dee6f72dc3 100644
--- a/net/ldns/utils/pkg/PLIST
+++ b/net/ldns/utils/pkg/PLIST
@@ -1,24 +1,25 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/06/03 15:03:10 jakob Exp $
-bin/ldns-chaos
-bin/ldns-compare-zones
-bin/ldns-dpa
-bin/ldns-key2ds
-bin/ldns-keyfetcher
-bin/ldns-keygen
-bin/ldns-mx
-bin/ldns-notify
-bin/ldns-read-zone
-bin/ldns-resolver
-bin/ldns-rrsig
-bin/ldns-signzone
-bin/ldns-testns
-bin/ldns-update
-bin/ldns-verify-zone
-bin/ldns-version
-bin/ldns-walk
-bin/ldns-zcat
-bin/ldns-zsplit
-bin/ldnsd
+@comment $OpenBSD: PLIST,v 1.3 2008/11/09 19:03:18 jakob Exp $
+@bin bin/ldns-chaos
+@bin bin/ldns-compare-zones
+@bin bin/ldns-dpa
+@bin bin/ldns-key2ds
+@bin bin/ldns-keyfetcher
+@bin bin/ldns-keygen
+@bin bin/ldns-mx
+@bin bin/ldns-notify
+@bin bin/ldns-read-zone
+@bin bin/ldns-resolver
+@bin bin/ldns-revoke
+@bin bin/ldns-rrsig
+@bin bin/ldns-signzone
+@bin bin/ldns-testns
+@bin bin/ldns-update
+@bin bin/ldns-verify-zone
+@bin bin/ldns-version
+@bin bin/ldns-walk
+@bin bin/ldns-zcat
+@bin bin/ldns-zsplit
+@bin bin/ldnsd
 @man man/man1/ldns-chaos.1
 @man man/man1/ldns-compare-zones.1
 @man man/man1/ldns-dpa.1
@@ -29,6 +30,7 @@ bin/ldnsd
 @man man/man1/ldns-notify.1
 @man man/man1/ldns-read-zone.1
 @man man/man1/ldns-resolver.1
+@man man/man1/ldns-revoke.1
 @man man/man1/ldns-rrsig.1
 @man man/man1/ldns-signzone.1
 @man man/man1/ldns-testns.1