diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 4b4feb93b259..ac791bc8fc53 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	djbdns
-PORTVERSION=	${DJBDNS_VER}
-PORTREVISION=	4
-CATEGORIES=	net
+PORTNAME?=	djbdns
+PORTVERSION?=	${DJBDNS_VER}
+PORTREVISION?=	4
+CATEGORIES?=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
-DISTNAME=	${PORTNAME}-${DJBDNS_VER}
+DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-.if !defined(WITHOUT_MAN)
+.if !defined(WITHOUT_MAN) && !defined(LIBDJBDNS_ONLY)
 MANDATE=	-20021211
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
@@ -29,7 +29,7 @@ MAN8=		axfr-get.8 axfrdns.8 dnscache-conf.8 dnscache.8 \
 MANCOMPRESSED=	no
 .endif
 
-.if defined(WITH_IPV6)
+.if defined(WITH_IPV6) && !defined(LIBDJBDNS_ONLY)
 PKGNAMESUFFIX=	-ipv6
 PORTVERSION=	${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//}
 PATCH_SITES+=	http://www.fefe.de/dns/
@@ -37,7 +37,7 @@ PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
-.if defined(WITH_DNSCACHE_DUMPCACHE)
+.if defined(WITH_DNSCACHE_DUMPCACHE) && !defined(LIBDJBDNS_ONLY)
 .if defined(WITH_IPV6)
 BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.
 .endif
@@ -50,23 +50,36 @@ CFLAGS+=	-DDUMPCACHE
 DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test14
 
-MAINTAINER=	roam@FreeBSD.org
-COMMENT=	"A collection of secure and reliable DNS tools"
+MAINTAINER?=	roam@FreeBSD.org
+COMMENT?=	A collection of secure and reliable DNS tools
 
+.if !defined(LIBDJBDNS_ONLY)
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+.endif
 
+.if !defined(LIBDJBDNS_ONLY)
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
+.else
+ALL_TARGET=	it-lib
+INSTALL_TARGET=	setup-lib check-lib
+PLIST=		${MASTERDIR}/pkg-plist.libdjbdns
+DESCR=		${MASTERDIR}/pkg-descr.libdjbdns
+PATCHFILES+=	libdjbdns-${PORTVERSION}${LIBDJBDNS_REV}.patch
+PATCH_SITES+=	http://devel.ringlet.net/net/libdjbdns/
+.endif
 
 NO_PACKAGE=	Forbidden - we have patches to the distribution.
 
+
 .if defined(WITH_IPV6)
 PLIST_SUB+=	WITH_IPV6=""
 .else
 PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
+.if !defined(LIBDJBDNS_ONLY)
 pre-fetch:
 	@${ECHO} "You can define the following variables to configure the djbdns build:"
 	@${ECHO} "- WITH_IPV6               - build with IPv6 support"
@@ -75,13 +88,19 @@ pre-fetch:
 	@${ECHO} "                            http://mapage.noos.fr/efge/djbdns/"
 	@${ECHO} "- WITHOUT_MAN             - do NOT install Gerritt Pape's manual pages"
 	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
+.endif
+
+.if defined(LIBDJBDNS_ONLY)
+pre-patch:
+	${CP} ${WRKSRC}/hier.c ${WRKSRC}/hier-lib.c
+.endif
 
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@echo "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
-.if !defined(WITHOUT_MAN)
+.if !defined(WITHOUT_MAN) && !defined(LIBDJBDNS_ONLY)
 post-install:
 	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${PREFIX}/man/man1/
 	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${PREFIX}/man/man8/
diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo
index 68cd9276bca7..153490f7aff6 100644
--- a/dns/djbdns/distinfo
+++ b/dns/djbdns/distinfo
@@ -2,3 +2,4 @@ MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
 MD5 (djbdns-1.05-man-20021211.tar.gz) = 0c927a369a38eac9c50f3d338aa2ed58
 MD5 (djbdns-1.05-test14.diff.bz2) = 52bec93d7ce6226281082367e49157d3
 MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
+MD5 (libdjbdns-1.05-pre1.patch) = 81e179f52711dcc18390bb088311175d
diff --git a/dns/djbdns/pkg-descr.libdjbdns b/dns/djbdns/pkg-descr.libdjbdns
new file mode 100644
index 000000000000..d2dbc59c8159
--- /dev/null
+++ b/dns/djbdns/pkg-descr.libdjbdns
@@ -0,0 +1,5 @@
+The libdjbdns port includes the libraries that come as part of
+Prof. Daniel J. Bernstein's djbdns package.
+
+Documentation is at the website below,
+WWW: http://cr.yp.to/djbdns.html
diff --git a/dns/djbdns/pkg-plist.libdjbdns b/dns/djbdns/pkg-plist.libdjbdns
new file mode 100644
index 000000000000..de6fadbc9f89
--- /dev/null
+++ b/dns/djbdns/pkg-plist.libdjbdns
@@ -0,0 +1,38 @@
+include/djb/alloc.h
+include/djb/auto_home.h
+include/djb/buffer.h
+include/djb/byte.h
+include/djb/case.h
+include/djb/dns.h
+include/djb/env.h
+include/djb/error.h
+include/djb/exit.h
+include/djb/fmt.h
+include/djb/gen_alloc.h
+include/djb/gen_allocdefs.h
+include/djb/getln.h
+include/djb/iopause.h
+include/djb/ip4.h
+include/djb/ndelay.h
+include/djb/open.h
+include/djb/openreadclose.h
+include/djb/readclose.h
+include/djb/scan.h
+include/djb/seek.h
+include/djb/sgetopt.h
+include/djb/socket.h
+include/djb/str.h
+include/djb/stralloc.h
+include/djb/strerr.h
+include/djb/subgetopt.h
+include/djb/uint16.h
+include/djb/uint32.h
+include/djb/uint64.h
+@dirrm include/djb
+lib/liballoc.a
+lib/libbuffer.a
+lib/libbyte.a
+lib/libdns.a
+lib/libenv.a
+lib/libgetopt.a
+lib/libunix.a
diff --git a/net/Makefile b/net/Makefile
index c542cda5a232..fbedde4f70bb 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -280,6 +280,7 @@
     SUBDIR += lft
     SUBDIR += libconnect
     SUBDIR += libdnet
+    SUBDIR += libdjbdns
     SUBDIR += liberator
     SUBDIR += libfreenet
     SUBDIR += libicq
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 4b4feb93b259..ac791bc8fc53 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	djbdns
-PORTVERSION=	${DJBDNS_VER}
-PORTREVISION=	4
-CATEGORIES=	net
+PORTNAME?=	djbdns
+PORTVERSION?=	${DJBDNS_VER}
+PORTREVISION?=	4
+CATEGORIES?=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
-DISTNAME=	${PORTNAME}-${DJBDNS_VER}
+DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-.if !defined(WITHOUT_MAN)
+.if !defined(WITHOUT_MAN) && !defined(LIBDJBDNS_ONLY)
 MANDATE=	-20021211
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
@@ -29,7 +29,7 @@ MAN8=		axfr-get.8 axfrdns.8 dnscache-conf.8 dnscache.8 \
 MANCOMPRESSED=	no
 .endif
 
-.if defined(WITH_IPV6)
+.if defined(WITH_IPV6) && !defined(LIBDJBDNS_ONLY)
 PKGNAMESUFFIX=	-ipv6
 PORTVERSION=	${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//}
 PATCH_SITES+=	http://www.fefe.de/dns/
@@ -37,7 +37,7 @@ PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
-.if defined(WITH_DNSCACHE_DUMPCACHE)
+.if defined(WITH_DNSCACHE_DUMPCACHE) && !defined(LIBDJBDNS_ONLY)
 .if defined(WITH_IPV6)
 BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.
 .endif
@@ -50,23 +50,36 @@ CFLAGS+=	-DDUMPCACHE
 DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test14
 
-MAINTAINER=	roam@FreeBSD.org
-COMMENT=	"A collection of secure and reliable DNS tools"
+MAINTAINER?=	roam@FreeBSD.org
+COMMENT?=	A collection of secure and reliable DNS tools
 
+.if !defined(LIBDJBDNS_ONLY)
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+.endif
 
+.if !defined(LIBDJBDNS_ONLY)
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
+.else
+ALL_TARGET=	it-lib
+INSTALL_TARGET=	setup-lib check-lib
+PLIST=		${MASTERDIR}/pkg-plist.libdjbdns
+DESCR=		${MASTERDIR}/pkg-descr.libdjbdns
+PATCHFILES+=	libdjbdns-${PORTVERSION}${LIBDJBDNS_REV}.patch
+PATCH_SITES+=	http://devel.ringlet.net/net/libdjbdns/
+.endif
 
 NO_PACKAGE=	Forbidden - we have patches to the distribution.
 
+
 .if defined(WITH_IPV6)
 PLIST_SUB+=	WITH_IPV6=""
 .else
 PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
+.if !defined(LIBDJBDNS_ONLY)
 pre-fetch:
 	@${ECHO} "You can define the following variables to configure the djbdns build:"
 	@${ECHO} "- WITH_IPV6               - build with IPv6 support"
@@ -75,13 +88,19 @@ pre-fetch:
 	@${ECHO} "                            http://mapage.noos.fr/efge/djbdns/"
 	@${ECHO} "- WITHOUT_MAN             - do NOT install Gerritt Pape's manual pages"
 	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
+.endif
+
+.if defined(LIBDJBDNS_ONLY)
+pre-patch:
+	${CP} ${WRKSRC}/hier.c ${WRKSRC}/hier-lib.c
+.endif
 
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@echo "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
-.if !defined(WITHOUT_MAN)
+.if !defined(WITHOUT_MAN) && !defined(LIBDJBDNS_ONLY)
 post-install:
 	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${PREFIX}/man/man1/
 	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${PREFIX}/man/man8/
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index 68cd9276bca7..153490f7aff6 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -2,3 +2,4 @@ MD5 (djbdns-1.05.tar.gz) = 3147c5cd56832aa3b41955c7a51cbeb2
 MD5 (djbdns-1.05-man-20021211.tar.gz) = 0c927a369a38eac9c50f3d338aa2ed58
 MD5 (djbdns-1.05-test14.diff.bz2) = 52bec93d7ce6226281082367e49157d3
 MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
+MD5 (libdjbdns-1.05-pre1.patch) = 81e179f52711dcc18390bb088311175d
diff --git a/net/djbdns/pkg-descr.libdjbdns b/net/djbdns/pkg-descr.libdjbdns
new file mode 100644
index 000000000000..d2dbc59c8159
--- /dev/null
+++ b/net/djbdns/pkg-descr.libdjbdns
@@ -0,0 +1,5 @@
+The libdjbdns port includes the libraries that come as part of
+Prof. Daniel J. Bernstein's djbdns package.
+
+Documentation is at the website below,
+WWW: http://cr.yp.to/djbdns.html
diff --git a/net/djbdns/pkg-plist.libdjbdns b/net/djbdns/pkg-plist.libdjbdns
new file mode 100644
index 000000000000..de6fadbc9f89
--- /dev/null
+++ b/net/djbdns/pkg-plist.libdjbdns
@@ -0,0 +1,38 @@
+include/djb/alloc.h
+include/djb/auto_home.h
+include/djb/buffer.h
+include/djb/byte.h
+include/djb/case.h
+include/djb/dns.h
+include/djb/env.h
+include/djb/error.h
+include/djb/exit.h
+include/djb/fmt.h
+include/djb/gen_alloc.h
+include/djb/gen_allocdefs.h
+include/djb/getln.h
+include/djb/iopause.h
+include/djb/ip4.h
+include/djb/ndelay.h
+include/djb/open.h
+include/djb/openreadclose.h
+include/djb/readclose.h
+include/djb/scan.h
+include/djb/seek.h
+include/djb/sgetopt.h
+include/djb/socket.h
+include/djb/str.h
+include/djb/stralloc.h
+include/djb/strerr.h
+include/djb/subgetopt.h
+include/djb/uint16.h
+include/djb/uint32.h
+include/djb/uint64.h
+@dirrm include/djb
+lib/liballoc.a
+lib/libbuffer.a
+lib/libbyte.a
+lib/libdns.a
+lib/libenv.a
+lib/libgetopt.a
+lib/libunix.a
diff --git a/net/libdjbdns/Makefile b/net/libdjbdns/Makefile
new file mode 100644
index 000000000000..2a840f237203
--- /dev/null
+++ b/net/libdjbdns/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: libdjbdns
+# Date created:		24 Jul 2003
+# Whom:			Peter Pentchev <roam@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libdjbdns
+
+COMMENT=	The libraries from Prof. Daniel J. Bernstein's djbdns package
+
+MASTERDIR=	${.CURDIR}/../djbdns
+
+LIBDJBDNS_ONLY=	yes
+LIBDJBDNS_REV=	-pre1
+
+.include "${MASTERDIR}/Makefile"