diff --git a/CHANGES b/CHANGES
index 22175e5dee..1496d0893a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -74,7 +74,7 @@
 			of ttl due to dns_diff_subtract() was ignoring the ttl
 			of records.  [RT #14616]
 
-1848.	[bug]		lwres also needs to know the print format for
+1854.	[bug]		lwres also needs to know the print format for
 			(long long).  [RT #13754]
 
 1853.	[bug]		Rework how DLV interacts with proveunsecure().
@@ -215,7 +215,7 @@
 
 1807.	[bug]		When forwarding (forward only) set the active domain
 			from the forward zone name. [RT #13526]
-			
+
 1806.	[bug]		The resolver returned the wrong result when a CNAME /
 			DNAME was encountered when fetching glue from a
 			secure namespace. [RT #13501]
@@ -640,7 +640,7 @@
 			unconditionally.  [RT #11595]
 
 1659.	[cleanup]	Cleanup some messages that were referring to KEY vs
-                        DNSKEY, NXT vs NSEC and SIG vs RRSIG.
+			DNSKEY, NXT vs NSEC and SIG vs RRSIG.
 
 1658.	[func]		Update dnssec-keygen to default to KEY for HMAC-MD5
 			and DH.  Tighten which options apply to KEY and
@@ -700,9 +700,6 @@
 
 1639.	[func]		Initial dlv system test.
 
-1638.	[bug]		"ixfr-from-differences" could generate a REQUIRE
-			failure if the journal open failed. [RT #11347]
-			
 1638.	[bug]		"ixfr-from-differences" could generate a REQUIRE
 			failure if the journal open failed. [RT #11347]
 			
diff --git a/FAQ b/FAQ
index 7e0e342e2b..ad6802c90b 100644
--- a/FAQ
+++ b/FAQ
@@ -501,3 +501,9 @@ A: These indicate a filesystem permission error preventing named creating /
 		masters { 192.168.4.12; };
 	}
 
+
+Q: How do I intergrate BIND 9 and Solaris SMF
+
+A: Sun has a blog entry describing how to do this.
+
+	http://blogs.sun.com/roller/page/anay/Weblog?catname=%2FSolaris
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index b193724cab..2dfcc3e957 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.82.18.10 2005/06/19 22:46:19 marka Exp $ */
+/* $Id: dig.h,v 1.82.18.11 2005/06/22 22:05:41 marka Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -140,7 +140,7 @@ isc_boolean_t	sigchase;
 #endif
 #endif
 	
-	char textname[MXNAME]; /* Name we're going to be looking up */
+	char textname[MXNAME]; /*% Name we're going to be looking up */
 	char cmdline[MXNAME];
 	dns_rdatatype_t rdtype;
 	dns_rdatatype_t qrdtype;
diff --git a/bin/named/query.c b/bin/named/query.c
index 16546300fa..da6b9df4b3 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.257.18.10 2005/06/17 02:04:30 marka Exp $ */
+/* $Id: query.c,v 1.257.18.11 2005/06/22 22:05:42 marka Exp $ */
 
 /*! \file */
 
@@ -717,7 +717,7 @@ query_getzonedb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
 	REQUIRE(zonep != NULL && *zonep == NULL);
 	REQUIRE(dbp != NULL && *dbp == NULL);
 
-	/*
+	/*%
 	 * Find a zone database to answer the query.
 	 */
 	ztoptions = ((options & DNS_GETDB_NOEXACT) != 0) ?
diff --git a/bin/named/server.c b/bin/named/server.c
index 5b36cbe10e..7ebe327136 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.419.18.25 2005/06/07 01:53:50 marka Exp $ */
+/* $Id: server.c,v 1.419.18.26 2005/06/22 22:05:42 marka Exp $ */
 
 /*! \file */
 
@@ -3901,7 +3901,6 @@ dumpdone(void *arg, isc_result_t result) {
 	dumpcontext_destroy(dctx);
 }
 
-
 isc_result_t
 ns_server_dumpdb(ns_server_t *server, char *args) {
 	struct dumpcontext *dctx = NULL;
diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index ed5c8ee240..e1fa93c6fe 100644
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.20.18.3 2005/03/16 00:56:24 marka Exp $ */
+/* $Id: os.c,v 1.20.18.4 2005/06/22 22:05:43 marka Exp $ */
 
 #include <config.h>
 #include <stdarg.h>
@@ -255,10 +255,6 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
 	(void)fclose(lockfile);
 }
 
-void
-ns_os_started(void) {
-}
-
 void
 ns_os_shutdown(void) {
 	closelog();
@@ -286,3 +282,7 @@ ns_os_tzset(void) {
 	tzset();
 #endif
 }
+
+void
+ns_os_started(void) {
+}
diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 5ff2abe958..d2214cd69f 100644
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -15,13 +15,14 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.15 2004/03/10 01:06:04 marka Exp $
+# $Id: clean.sh,v 1.15.18.1 2005/06/22 22:05:43 marka Exp $
 
-rm -f */K* */keyset-* */signedkey-* */*.signed */trusted.conf */tmp*
+rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp*
 rm -f ns1/root.db ns2/example.db ns3/secure.example.db
 rm -f ns3/unsecure.example.db ns3/bogus.example.db ns3/keyless.example.db
 rm -f ns3/dynamic.example.db ns3/dynamic.example.db.signed.jnl
+rm -f ns2/private.secure.example.db
 rm -f */example.bk
 rm -f dig.out.*
 rm -f random.data
-
+rm -f ns2/dlv.db
diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index 4d72856f7d..f0cdeecec5 100644
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.10 2004/03/10 01:06:06 marka Exp $
+# $Id: clean.sh,v 1.10.18.1 2005/06/22 22:05:44 marka Exp $
 
 #
 # Clean up after zone transfer quota tests.
@@ -24,3 +24,4 @@
 rm -f ns1/zone*.example.db ns1/zones.conf
 rm -f ns2/zone*.example.bk ns2/zones.conf
 rm -f dig.out.* ns2/changing.bk
+rm -f ns1/changing.db
diff --git a/doc/dev/release b/doc/dev/release
index ed4859d268..97f31349e9 100644
--- a/doc/dev/release
+++ b/doc/dev/release
@@ -2,7 +2,7 @@ Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2000-2003  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: release,v 1.60 2004/03/18 02:57:55 marka Exp $
+$Id: release,v 1.60.18.1 2005/06/22 22:05:45 marka Exp $
 
 Preparing a bind9 release
 
@@ -165,14 +165,17 @@ release.
    $ new_patch=bind-9.x.z-patch
    $ files=`awk '/^Index:/ && NF == 2 {print $2}' $patchd/$old_patch`
    $ missing=`cvs log -R $files 2>&1 >/dev/null | \
-              awk '/^cvs log: nothing known about/ {print $6}'`
+              awk '/^cvs (log|server): nothing known about/ {print $6}'`
+   $ sed '/^Index:/,$d' $patchd/$old_patch > $patchd/$new_patch
    $ for i in $missing; \
-       do echo Index: $i; diff -u /dev/null $i; done >$patchd/$new_patch
-   $ cvs -f diff -U 2 -N $files >>$patchd/$new_patch
+       do echo Index: $i; diff -u /dev/null $i; done >> $patchd/$new_patch
+   $ cvs -f diff -U 2 -N $files >> $patchd/$new_patch
 
-   [ Add comment at head of new patch file ]
    $ cvs add -ko $patchd/$new_patch
    $ cvs ci $patchd/$new_patch
+   
+   $ cvs update -C
+   $ rm README.idnkit
 
  - Add a marker line like "	--- 9.0.0rc10 released ---"
    to the CHANGES file.
diff --git a/lib/bind/bsd/ftruncate.c b/lib/bind/bsd/ftruncate.c
index 257e4f6fda..b222c8b25e 100644
--- a/lib/bind/bsd/ftruncate.c
+++ b/lib/bind/bsd/ftruncate.c
@@ -1,8 +1,8 @@
 #ifndef LINT
-static const char rcsid[] = "$Id: ftruncate.c,v 1.1.352.2 2005/04/27 18:17:28 sra Exp $";
+static const char rcsid[] = "$Id: ftruncate.c,v 1.1.352.3 2005/06/22 22:05:45 marka Exp $";
 #endif
 
-/*! \file 
+/*! \file
  * \brief
  * ftruncate - set file size, BSD Style
  *
diff --git a/lib/bind/include/netgroup.h b/lib/bind/include/netgroup.h
index 1e38a84d65..e4be459fdf 100644
--- a/lib/bind/include/netgroup.h
+++ b/lib/bind/include/netgroup.h
@@ -11,12 +11,15 @@ int getnetgrent __P((/* const */ char **, /* const */ char **,
 
 int getnetgrent_r __P((char **, char **, char **, char *, int));
 
-void setnetgrent __P((const char *));
-
 void endnetgrent __P((void));
 
+#ifdef __osf__
+int innetgr __P((char *, char *, char *, char *));
+void setnetgrent __P((char *));
+#else
+void setnetgrent __P((const char *));
 int innetgr __P((const char *, const char *, const char *, const char *));
-
+#endif
 #endif
 #endif
 
diff --git a/lib/bind/irs/getnetgrent_r.c b/lib/bind/irs/getnetgrent_r.c
index c0e87fa811..cb0940d75f 100644
--- a/lib/bind/irs/getnetgrent_r.c
+++ b/lib/bind/irs/getnetgrent_r.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: getnetgrent_r.c,v 1.7.18.2 2005/04/27 05:00:58 sra Exp $";
+static const char rcsid[] = "$Id: getnetgrent_r.c,v 1.7.18.3 2005/06/22 22:05:46 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <port_before.h>
@@ -76,7 +76,9 @@ setnetgrent_r(const char *netgroup, NGR_R_ENT_ARGS)
 setnetgrent_r(const char *netgroup)
 #endif
 {
-	setnetgrent(netgroup);
+	char *tmp;
+	DE_CONST(netgroup, tmp);
+	setnetgrent(tmp);
 #ifdef NGR_R_PRIVATE
 	*buf = NULL;
 #endif
diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h
index 8cf009f132..ed3c6384cc 100644
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress.h,v 1.32.18.3 2005/04/27 05:01:31 sra Exp $ */
+/* $Id: compress.h,v 1.32.18.4 2005/06/22 22:05:47 marka Exp $ */
 
 #ifndef DNS_COMPRESS_H
 #define DNS_COMPRESS_H 1
@@ -32,7 +32,7 @@ ISC_LANG_BEGINDECLS
 #define DNS_COMPRESS_ALL		0x01	/*%< all compression. */
 #define DNS_COMPRESS_CASESENSITIVE	0x02	/*%< case sensitive compression. */
 
-/*! \file 
+/*! \file
  *	Direct manipulation of the structures is strongly discouraged.
  */
 
diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index f891b93413..f4be1fd88f 100644
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -3,6 +3,20 @@ LIBRARY libdns
 ; Exported Functions
 EXPORTS
 
+dns_acache_attach
+dns_acache_attachentry
+dns_acache_cancelentry
+dns_acache_create
+dns_acache_createentry
+dns_acache_detach
+dns_acache_detachentry
+dns_acache_getentry
+dns_acache_putdb
+dns_acache_setcachesize
+dns_acache_setcleaninginterval
+dns_acache_setdb
+dns_acache_setentry
+dns_acache_shutdown
 dns_acl_any
 dns_acl_appendelement
 dns_acl_attach
@@ -85,6 +99,8 @@ dns_db_find
 dns_db_findnode
 dns_db_findrdataset
 dns_db_findzonecut
+dns_db_getnsnode
+dns_db_getsoanode
 dns_db_getsoaserial
 dns_db_iscache
 dns_db_ispersistent
@@ -99,6 +115,8 @@ dns_db_origin
 dns_db_overmem
 dns_db_printnode
 dns_db_register
+dns_db_setnsnode
+dns_db_setsoanode
 dns_db_subtractrdataset
 dns_db_unregister
 dns_dbiterator_current
@@ -291,6 +309,7 @@ dns_name_getlabelsequence
 dns_name_hasbuffer
 dns_name_hash
 dns_name_init
+dns_name_internalwildcard
 dns_name_invalidate
 dns_name_isabsolute
 dns_name_issubdomain
@@ -398,12 +417,15 @@ dns_rdataset_count
 dns_rdataset_current
 dns_rdataset_disassociate
 dns_rdataset_first
+dns_rdataset_getadditional
 dns_rdataset_getnoqname
 dns_rdataset_init
 dns_rdataset_invalidate
 dns_rdataset_isassociated
 dns_rdataset_makequestion
 dns_rdataset_next
+dns_rdataset_putadditional
+dns_rdataset_setadditional
 dns_rdataset_totext
 dns_rdataset_towire
 dns_rdataset_towiresorted
@@ -544,6 +566,7 @@ dns_view_flushanddetach
 dns_view_flushcache
 dns_view_flushname
 dns_view_freeze
+dns_view_freezezones
 dns_view_getpeertsig
 dns_view_gettsig
 dns_view_load
@@ -623,6 +646,7 @@ dns_zone_notify
 dns_zone_notifyreceive
 dns_zone_refresh
 dns_zone_replacedb
+dns_zone_setacache
 dns_zone_setalsonotify
 dns_zone_setaltxfrsource4
 dns_zone_setaltxfrsource6
@@ -648,6 +672,7 @@ dns_zone_setmaxxfrout
 dns_zone_setminrefreshtime
 dns_zone_setminretrytime
 dns_zone_setnotifyacl
+dns_zone_setnotifydelay
 dns_zone_setnotifysrc4
 dns_zone_setnotifysrc6
 dns_zone_setnotifytype
diff --git a/lib/dns/win32/libdns.dsp b/lib/dns/win32/libdns.dsp
index fef4f59207..1e238079a1 100644
--- a/lib/dns/win32/libdns.dsp
+++ b/lib/dns/win32/libdns.dsp
@@ -98,6 +98,10 @@ LINK32=link.exe
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=..\include\dns\acache.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\dns\acl.h
 # End Source File
 # Begin Source File
@@ -398,6 +402,10 @@ SOURCE=..\include\dns\zt.h
 # PROP Default_Filter "c"
 # Begin Source File
 
+SOURCE=..\acache.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\acl.c
 # End Source File
 # Begin Source File
diff --git a/lib/dns/win32/libdns.mak b/lib/dns/win32/libdns.mak
index caee8ee8bd..8adbc13322 100644
--- a/lib/dns/win32/libdns.mak
+++ b/lib/dns/win32/libdns.mak
@@ -45,6 +45,7 @@ CLEAN :"libisc - Win32 ReleaseCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
+	-@erase "$(INTDIR)\acache.obj"
 	-@erase "$(INTDIR)\acl.obj"
 	-@erase "$(INTDIR)\adb.obj"
 	-@erase "$(INTDIR)\byaddr.obj"
@@ -169,6 +170,7 @@ LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.l
 DEF_FILE= \
 	".\libdns.def"
 LINK32_OBJS= \
+	"$(INTDIR)\acache.obj" \
 	"$(INTDIR)\acl.obj" \
 	"$(INTDIR)\adb.obj" \
 	"$(INTDIR)\byaddr.obj" \
@@ -270,6 +272,8 @@ CLEAN :"libisc - Win32 DebugCLEAN"
 !ELSE 
 CLEAN :
 !ENDIF 
+	-@erase "$(INTDIR)\acache.obj"
+	-@erase "$(INTDIR)\acache.sbr"
 	-@erase "$(INTDIR)\acl.obj"
 	-@erase "$(INTDIR)\acl.sbr"
 	-@erase "$(INTDIR)\adb.obj"
@@ -464,6 +468,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc" 
 BSC32_SBRS= \
+	"$(INTDIR)\acache.sbr" \
 	"$(INTDIR)\acl.sbr" \
 	"$(INTDIR)\adb.sbr" \
 	"$(INTDIR)\byaddr.sbr" \
@@ -546,6 +551,7 @@ LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib
 DEF_FILE= \
 	".\libdns.def"
 LINK32_OBJS= \
+	"$(INTDIR)\acache.obj" \
 	"$(INTDIR)\acl.obj" \
 	"$(INTDIR)\adb.obj" \
 	"$(INTDIR)\byaddr.obj" \
@@ -637,6 +643,24 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "libdns - Win32 Release" || "$(CFG)" == "libdns - Win32 Debug"
+SOURCE=..\acache.c
+
+!IF  "$(CFG)" == "libdns - Win32 Release"
+
+
+"$(INTDIR)\acache.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+
+
+"$(INTDIR)\acache.obj"	"$(INTDIR)\acache.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
 SOURCE=..\acl.c
 
 !IF  "$(CFG)" == "libdns - Win32 Release"
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index f51b55fc72..7445a8df37 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.410.18.29 2005/06/20 01:19:42 marka Exp $ */
+/* $Id: zone.c,v 1.410.18.30 2005/06/22 22:05:46 marka Exp $ */
 
 /*! \file */
 
@@ -2018,7 +2018,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_name_t *name) {
 		dns_zone_log(zone, level, "NS '%s' is a CNAME (illegal)",
 			     namebuf);
 		return (ISC_FALSE);
- 	}
+	}
 
 	if (result == DNS_R_DNAME) {
 		dns_name_format(foundname, altbuf, sizeof altbuf);
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index 7afee2a45e..0de3493fc5 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.62.18.3 2005/04/29 00:17:02 marka Exp $ */
+/* $Id: result.h,v 1.62.18.4 2005/06/22 22:05:49 marka Exp $ */
 
 #ifndef ISC_RESULT_H
 #define ISC_RESULT_H 1
@@ -84,9 +84,7 @@
 #define ISC_R_MAXSIZE			58	/*%< max size */
 #define ISC_R_BADADDRESSFORM		59	/*%< invalid address format */
 
-/*%
- * Not a result code: the number of results.
- */
+/*% Not a result code: the number of results. */
 #define ISC_R_NRESULTS 			60
 
 ISC_LANG_BEGINDECLS
diff --git a/lib/isc/result.c b/lib/isc/result.c
index 840385747b..e0c86539a1 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.62.18.5 2005/06/08 02:07:56 marka Exp $ */
+/* $Id: result.c,v 1.62.18.6 2005/06/22 22:05:48 marka Exp $ */
 
 /*! \file */
 
@@ -41,66 +41,66 @@ typedef struct resulttable {
 } resulttable;
 
 static const char *text[ISC_R_NRESULTS] = {
-	"success",				/*  0 */
-	"out of memory",			/*  1 */
-	"timed out",				/*  2 */
-	"no available threads",			/*  3 */
-	"address not available",		/*  4 */
-	"address in use",			/*  5 */
-	"permission denied",			/*  6 */
-	"no pending connections",		/*  7 */
-	"network unreachable",			/*  8 */
-	"host unreachable",			/*  9 */
-	"network down",				/* 10 */
-	"host down",				/* 11 */
-	"connection refused",			/* 12 */
-	"not enough free resources",		/* 13 */
-	"end of file",				/* 14 */
-	"socket already bound",			/* 15 */
-	"reload",				/* 16 */
-	"lock busy",				/* 17 */
-	"already exists",			/* 18 */
-	"ran out of space",			/* 19 */
-	"operation canceled",			/* 20 */
-	"socket is not bound",			/* 21 */
-	"shutting down",			/* 22 */
-	"not found",				/* 23 */
-	"unexpected end of input",		/* 24 */
-	"failure",				/* 25 */
-	"I/O error",				/* 26 */
-	"not implemented",			/* 27 */
-	"unbalanced parentheses",		/* 28 */
-	"no more",				/* 29 */
-	"invalid file",				/* 30 */
-	"bad base64 encoding",			/* 31 */
-	"unexpected token",			/* 32 */
-	"quota reached",			/* 33 */
-	"unexpected error",			/* 34 */
-	"already running",			/* 35 */
-	"ignore",				/* 36 */
-	"address mask not contiguous",		/* 37 */
-	"file not found",			/* 38 */
-	"file already exists",			/* 39 */
-	"socket is not connected",		/* 40 */
-	"out of range",				/* 41 */
-	"out of entropy",			/* 42 */
-	"invalid use of multicast address",	/* 43 */
-	"not a file",				/* 44 */
-	"not a directory",			/* 45 */
-	"queue is full",			/* 46 */
-	"address family mismatch",		/* 47 */
-	"address family not supported",		/* 48 */
-	"bad hex encoding",			/* 49 */
-	"too many open files",			/* 50 */
-	"not blocking",				/* 51 */
-	"unbalanced quotes",			/* 52 */
-	"operation in progress",		/* 53 */
-	"connection reset",			/* 54 */
-	"soft quota reached",			/* 55 */
-	"not a valid number",			/* 56 */
-	"disabled",				/* 57 */
-	"max size",				/* 58 */
-	"invalid address format"		/* 59 */
+	"success",				/*%< 0 */
+	"out of memory",			/*%< 1 */
+	"timed out",				/*%< 2 */
+	"no available threads",			/*%< 3 */
+	"address not available",		/*%< 4 */
+	"address in use",			/*%< 5 */
+	"permission denied",			/*%< 6 */
+	"no pending connections",		/*%< 7 */
+	"network unreachable",			/*%< 8 */
+	"host unreachable",			/*%< 9 */
+	"network down",				/*%< 10 */
+	"host down",				/*%< 11 */
+	"connection refused",			/*%< 12 */
+	"not enough free resources",		/*%< 13 */
+	"end of file",				/*%< 14 */
+	"socket already bound",			/*%< 15 */
+	"reload",				/*%< 16 */
+	"lock busy",				/*%< 17 */
+	"already exists",			/*%< 18 */
+	"ran out of space",			/*%< 19 */
+	"operation canceled",			/*%< 20 */
+	"socket is not bound",			/*%< 21 */
+	"shutting down",			/*%< 22 */
+	"not found",				/*%< 23 */
+	"unexpected end of input",		/*%< 24 */
+	"failure",				/*%< 25 */
+	"I/O error",				/*%< 26 */
+	"not implemented",			/*%< 27 */
+	"unbalanced parentheses",		/*%< 28 */
+	"no more",				/*%< 29 */
+	"invalid file",				/*%< 30 */
+	"bad base64 encoding",			/*%< 31 */
+	"unexpected token",			/*%< 32 */
+	"quota reached",			/*%< 33 */
+	"unexpected error",			/*%< 34 */
+	"already running",			/*%< 35 */
+	"ignore",				/*%< 36 */
+	"address mask not contiguous",		/*%< 37 */
+	"file not found",			/*%< 38 */
+	"file already exists",			/*%< 39 */
+	"socket is not connected",		/*%< 40 */
+	"out of range",				/*%< 41 */
+	"out of entropy",			/*%< 42 */
+	"invalid use of multicast address",	/*%< 43 */
+	"not a file",				/*%< 44 */
+	"not a directory",			/*%< 45 */
+	"queue is full",			/*%< 46 */
+	"address family mismatch",		/*%< 47 */
+	"address family not supported",		/*%< 48 */
+	"bad hex encoding",			/*%< 49 */
+	"too many open files",			/*%< 50 */
+	"not blocking",				/*%< 51 */
+	"unbalanced quotes",			/*%< 52 */
+	"operation in progress",		/*%< 53 */
+	"connection reset",			/*%< 54 */
+	"soft quota reached",			/*%< 55 */
+	"not a valid number",			/*%< 56 */
+	"disabled",				/*%< 57 */
+	"max size",				/*%< 58 */
+	"invalid address format"		/*%< 59 */
 };
 
 #define ISC_RESULT_RESULTSET			2
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index ac781678d0..aad975428d 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -124,347 +124,319 @@ isc_hash_ctxdetach
 isc_hash_ctxinit
 isc_hash_destroy
 isc_hash_init
-isc_hex_totext
 isc_hex_decodestring
 isc_hex_tobuffer
+isc_hex_totext
 isc_hmacmd5_init
 isc_hmacmd5_invalidate
-isc_hmacmd5_update
 isc_hmacmd5_sign
+isc_hmacmd5_update
 isc_hmacmd5_verify
 isc_interfaceiter_create
-isc_interfaceiter_first
 isc_interfaceiter_current
-isc_interfaceiter_next
 isc_interfaceiter_destroy
-isc_lex_setcomments
+isc_interfaceiter_first
+isc_interfaceiter_next
+isc_interval_iszero
+isc_interval_set
+isc_keyboard_canceled
+isc_keyboard_close
+isc_keyboard_getchar
+isc_keyboard_open
+isc_lex_close
 isc_lex_create
 isc_lex_destroy
 isc_lex_getcomments
-isc_lex_setcomments
+isc_lex_getlasttokentext
+isc_lex_getmastertoken
+isc_lex_getsourceline
+isc_lex_getsourcename
 isc_lex_getspecials
-isc_lex_setspecials
+isc_lex_gettoken
+isc_lex_isfile
+isc_lex_openbuffer
 isc_lex_openfile
 isc_lex_openstream
-isc_lex_openbuffer
-isc_lex_close
-isc_lex_gettoken
-isc_lex_getmastertoken
+isc_lex_setcomments
+isc_lex_setcomments
+isc_lex_setspecials
 isc_lex_ungettoken
-isc_lex_getlasttokentext
-isc_lex_getsourcename
-isc_lex_getsourceline
-isc_lex_isfile
-isc_lfsr_init
 isc_lfsr_generate
-isc_lfsr_skip
 isc_lfsr_generate32
+isc_lfsr_init
+isc_lfsr_skip
 isc_lib_initmsgcat
-isc_log_createchannel
-isc_log_createchannel
+isc_log_categorybyname
+isc_log_closefilelogs
 isc_log_create
-isc_logconfig_create
-isc_logconfig_get
-isc_logconfig_use
+isc_log_createchannel
+isc_log_createchannel
+isc_log_createchannel
 isc_log_destroy
-isc_logconfig_destroy
+isc_log_getdebuglevel
+isc_log_getduplicateinterval
+isc_log_gettag
+isc_log_ivwrite
+isc_log_ivwrite1
+isc_log_iwrite
+isc_log_iwrite1
+isc_log_modulebyname
+isc_log_opensyslog
 isc_log_registercategories
 isc_log_registermodules
-isc_log_createchannel
-isc_log_usechannel
-isc_log_write
-isc_log_vwrite
-isc_log_write1
-isc_log_vwrite1
-isc_log_iwrite
-isc_log_ivwrite
-isc_log_iwrite1
-isc_log_ivwrite1
+isc_log_setcontext
 isc_log_setdebuglevel
-isc_log_getdebuglevel
+isc_log_setduplicateinterval
+isc_log_settag
+isc_log_usechannel
+isc_log_vwrite
+isc_log_vwrite1
 isc_log_wouldlog
 isc_log_write
-isc_log_setduplicateinterval
-isc_log_getduplicateinterval
-isc_log_settag
-isc_log_gettag
-isc_log_opensyslog
-isc_log_closefilelogs
-isc_log_categorybyname
-isc_log_modulebyname
-isc_log_setcontext
+isc_log_write
+isc_log_write1
+isc_logconfig_create
+isc_logconfig_destroy
+isc_logconfig_get
+isc_logconfig_use
+isc_md5_final
 isc_md5_init
 isc_md5_invalidate
 isc_md5_update
-isc_md5_final
 isc_mem_attach
-isc_mem_detach
-isc_mem_detach
+isc_mem_attach
 isc_mem_create
 isc_mem_createx
-isc_mem_attach
-isc_mem_detach
 isc_mem_destroy
-isc_mem_ondestroy
-isc_mem_stats
-isc_mem_setdestroycheck
-isc_mem_setquota
+isc_mem_detach
+isc_mem_detach
+isc_mem_detach
 isc_mem_getquota
 isc_mem_inuse
+isc_mem_ondestroy
+isc_mem_setdestroycheck
+isc_mem_setquota
 isc_mem_setwater
+isc_mem_stats
+isc_mempool_associatelock
 isc_mempool_create
 isc_mempool_destroy
-isc_mempool_setname
-isc_mempool_associatelock
-isc_mempool_getfreemax
-isc_mempool_setfreemax
-isc_mempool_getfreecount
-isc_mempool_getmaxalloc
-isc_mempool_setmaxalloc
 isc_mempool_getallocated
 isc_mempool_getfillcount
+isc_mempool_getfreecount
+isc_mempool_getfreemax
+isc_mempool_getmaxalloc
 isc_mempool_setfillcount
-isc__mem_get
-isc__mem_putanddetach
-isc__mem_put
-isc__mem_allocate
-isc__mem_free
-isc__mem_strdup
-isc__mempool_get
-isc__mempool_put
-isc_msgcat_open
+isc_mempool_setfreemax
+isc_mempool_setmaxalloc
+isc_mempool_setname
 isc_msgcat_close
 isc_msgcat_get
-isc_mutexblock_init
+isc_msgcat_open
 isc_mutexblock_destroy
-isc_netaddr_equal
-isc_netaddr_eqprefix
-isc_netaddr_masktoprefixlen
-isc_netaddr_totext
-isc_netaddr_format
-isc_netaddr_fromsockaddr
-isc_netaddr_fromin
-isc_netaddr_fromin6
+isc_mutexblock_init
+isc_net_aton
+isc_net_aton
+isc_net_disableipv4
+isc_net_disableipv6
+isc_net_ntop
+isc_net_ntop
+isc_net_probe_ipv6only
+isc_net_probe_ipv6pktinfo
+isc_net_probeipv4
+isc_net_probeipv4
+isc_net_probeipv6
+isc_net_probeipv6
+isc_net_probeunix
+isc_net_pton
+isc_net_pton
 isc_netaddr_any
 isc_netaddr_any6
-isc_netaddr_ismulticast
+isc_netaddr_eqprefix
+isc_netaddr_equal
+isc_netaddr_format
+isc_netaddr_fromin
+isc_netaddr_fromin6
+isc_netaddr_frompath
+isc_netaddr_fromsockaddr
 isc_netaddr_fromv4mapped
+isc_netaddr_ismulticast
+isc_netaddr_masktoprefixlen
+isc_netaddr_prefixok
 isc_netaddr_setzone
+isc_netaddr_totext
 isc_netscope_pton
-isc_ntpaths_init
 isc_ntpaths_get
+isc_ntpaths_init
+isc_once_do
 isc_ondestroy_init
-isc_ondestroy_register
 isc_ondestroy_notify
-isc_task_sendanddetach
+isc_ondestroy_register
 isc_os_ncpus
-isc_quota_init
-isc_quota_destroy
-isc_quota_soft
-isc_quota_reserve
-isc_quota_release
+isc_parse_uint16
+isc_parse_uint32
+isc_parse_uint8
 isc_quota_attach
+isc_quota_destroy
 isc_quota_detach
-isc_random_seed
+isc_quota_init
+isc_quota_release
+isc_quota_reserve
+isc_quota_soft
 isc_random_get
 isc_random_jitter
+isc_random_seed
+isc_ratelimiter_attach
 isc_ratelimiter_create
+isc_ratelimiter_detach
+isc_ratelimiter_enqueue
 isc_ratelimiter_setinterval
 isc_ratelimiter_setpertic
-isc_ratelimiter_enqueue
 isc_ratelimiter_shutdown
-isc_ratelimiter_attach
-isc_ratelimiter_detach
-isc_resource_setlimit
+isc_region_compare
 isc_resource_getlimit
-isc_result_totext
+isc_resource_setlimit
 isc_result_register
+isc_result_totext
+isc_rwlock_destroy
+isc_rwlock_downgrade
 isc_rwlock_init
 isc_rwlock_lock
 isc_rwlock_trylock
+isc_rwlock_tryupgrade
 isc_rwlock_unlock
-isc_rwlock_destroy
-isc_serial_lt
+isc_serial_eq
+isc_serial_ge
 isc_serial_gt
 isc_serial_le
-isc_serial_ge
-isc_serial_eq
+isc_serial_lt
 isc_serial_ne
+isc_sha1_final
 isc_sha1_init
 isc_sha1_invalidate
 isc_sha1_update
-isc_sha1_final
-isc_sockaddr_equal
-isc_sockaddr_eqaddr
-isc_sockaddr_eqaddrprefix
-isc_sockaddr_hash
 isc_sockaddr_any
 isc_sockaddr_any6
 isc_sockaddr_anyofpf
+isc_sockaddr_compare
+isc_sockaddr_eqaddr
+isc_sockaddr_eqaddrprefix
+isc_sockaddr_equal
+isc_sockaddr_format
 isc_sockaddr_fromin
 isc_sockaddr_fromin6
-isc_sockaddr_v6fromin
 isc_sockaddr_fromnetaddr
+isc_sockaddr_frompath
+isc_sockaddr_getport
+isc_sockaddr_hash
+isc_sockaddr_isexperimental
+isc_sockaddr_ismulticast
 isc_sockaddr_pf
 isc_sockaddr_setport
-isc_sockaddr_getport
 isc_sockaddr_totext
-isc_sockaddr_format
-isc_sockaddr_ismulticast
-isc_socket_create
-isc_socket_cancel
-;isc_socket_shutdown
-isc_socket_attach
-isc_socket_detach
-isc_socket_bind
-isc_socket_listen
+isc_sockaddr_v6fromin
 isc_socket_accept
+isc_socket_attach
+isc_socket_bind
+isc_socket_cancel
+isc_socket_cleanunix
 isc_socket_connect
+isc_socket_create
+isc_socket_detach
+isc_socket_filter
 isc_socket_getpeername
 isc_socket_getsockname
+isc_socket_gettype
+isc_socket_ipv6only
+isc_socket_isbound
+isc_socket_listen
+isc_socket_permunix
 isc_socket_recv
-isc_socket_recvv
 isc_socket_recv2
+isc_socket_recvv
 isc_socket_send
 isc_socket_sendto
-isc_socket_sendv
-isc_socket_sendtov
 isc_socket_sendto2
+isc_socket_sendtov
+isc_socket_sendv
 isc_socketmgr_create
 isc_socketmgr_destroy
-isc_socket_gettype
-isc_socket_isbound
-isc_stdio_open
 isc_stdio_close
-isc_stdio_seek
-isc_stdio_read
-isc_stdio_write
 isc_stdio_flush
+isc_stdio_open
+isc_stdio_read
+isc_stdio_seek
 isc_stdio_sync
-isc_string_touint64
+isc_stdio_write
+isc_stdtime_get
 isc_string_separate
+isc_string_strlcat
+isc_string_strlcpy
+isc_string_strlcpy
+isc_string_touint64
 isc_symtab_create
+isc_symtab_define
 isc_symtab_destroy
 isc_symtab_lookup
-isc_symtab_define
 isc_symtab_undefine
-isc_task_create
+isc_syslog_facilityfromstring
 isc_task_attach
-isc_task_detach
-isc_task_send
-isc_task_sendanddetach
-isc_task_purgerange
-isc_task_purge
-isc_task_purgeevent
-isc_task_unsendrange
-isc_task_unsend
-isc_task_onshutdown
-isc_task_shutdown
+isc_task_beginexclusive
+isc_task_create
 isc_task_destroy
-isc_task_setname
+isc_task_detach
+isc_task_endexclusive
+isc_task_endexclusive
+isc_task_getcurrenttime
 isc_task_getname
 isc_task_gettag
-isc_task_beginexclusive
-isc_task_endexclusive
-isc_task_endexclusive
+isc_task_onshutdown
+isc_task_purge
+isc_task_purgeevent
+isc_task_purgerange
+isc_task_send
+isc_task_sendanddetach
+isc_task_sendanddetach
+isc_task_setname
+isc_task_shutdown
+isc_task_unsend
+isc_task_unsendrange
 isc_taskmgr_create
 isc_taskmgr_destroy
 isc_taskpool_create
-isc_taskpool_gettask
 isc_taskpool_destroy
-isc_timer_create
-isc_timer_reset
-isc_timer_touch
-isc_timer_attach
-isc_timer_detach
-isc_timermgr_create
-isc_timermgr_destroy
-isc_condition_init
-isc_condition_wait
-isc_condition_signal
-isc_condition_broadcast
-isc_condition_destroy
-isc_condition_waituntil
-isc_dir_init
-isc_dir_open
-isc_dir_read
-isc_dir_reset
-isc_dir_close
-isc_dir_chdir
-isc_dir_chroot
-isc_net_probeipv4
-isc_net_probeipv6
-isc_net_ntop
-isc_net_pton
-isc_net_aton
-isc_once_do
-isc_stdtime_get
-
+isc_taskpool_gettask
+isc_thread_create
 isc_thread_create
 isc_thread_join
+isc_thread_join
+isc_thread_setconcurrency
 isc_thread_setconcurrency
-isc_interval_set
-isc_time_subtract
-isc_interval_iszero
-isc_time_settoepoch
-isc_time_isepoch
-isc_time_now
-isc_time_nowplusinterval
-isc_time_compare
 isc_time_add
-isc_time_subtract
+isc_time_compare
+isc_time_isepoch
 isc_time_microdiff
 isc_time_nanoseconds
-isc_keyboard_open
-isc_keyboard_close
-isc_keyboard_getchar
-isc_keyboard_canceled
-isc_app_start
-isc_app_onrun
-isc_app_run
-isc_app_shutdown
-isc_app_reload
-isc_app_finish
-isc_app_block
-isc_app_unblock
-isc_thread_create
-isc_thread_join
-isc_thread_setconcurrency
-isc_net_probeipv4
-isc_net_probeipv6
-isc_net_ntop
-isc_net_pton
-isc_net_aton
-openlog
-syslog
-closelog
-isc_syslog_facilityfromstring
-NTReportError
-
-isc_file_truncate
-isc__strerror
-isc_parse_uint32
-isc_parse_uint16
-isc_parse_uint8
+isc_time_now
+isc_time_nowplusinterval
+isc_time_settoepoch
+isc_time_subtract
+isc_time_subtract
+isc_timer_attach
+isc_timer_create
+isc_timer_detach
+isc_timer_reset
+isc_timer_touch
+isc_timermgr_create
+isc_timermgr_destroy
+isc_timermgr_poke
 isc_win32os_majorversion
 isc_win32os_minorversion
 isc_win32os_servicepackmajor
 isc_win32os_servicepackminor
 isc_win32os_versioncheck
-isc_socket_ipv6only
-isc_region_compare
-isc_socket_filter
-isc_string_strlcpy
-isc_rwlock_tryupgrade
-isc_rwlock_downgrade
-isc_sockaddr_isexperimental
-isc_net_disableipv4
-isc_net_disableipv6
-isc_task_getcurrenttime
-isc_net_probe_ipv6only
-isc_net_probe_ipv6pktinfo
-isc_string_strlcat
-isc_string_strlcpy
+openlog
+syslog
 
 ; Exported Data
 
diff --git a/lib/isccfg/win32/libisccfg.def b/lib/isccfg/win32/libisccfg.def
index ca8c11c3ce..22383b1030 100644
--- a/lib/isccfg/win32/libisccfg.def
+++ b/lib/isccfg/win32/libisccfg.def
@@ -3,41 +3,42 @@ LIBRARY libisccfg
 ; Exported Functions
 EXPORTS
 
-cfg_parser_create
-cfg_parser_setcallback
-cfg_parse_file
-cfg_parse_buffer
-cfg_parser_destroy
-cfg_obj_isvoid
-cfg_obj_ismap
-cfg_map_get
-cfg_map_getname
-cfg_obj_istuple
-cfg_tuple_get
-cfg_obj_isuint32
-cfg_obj_asuint32
-cfg_obj_isuint64
-cfg_obj_asuint64
-cfg_obj_isstring
-cfg_obj_asstring
-cfg_obj_isboolean
-cfg_obj_asboolean
-cfg_obj_issockaddr
-cfg_obj_assockaddr
-cfg_obj_isnetprefix
-cfg_obj_asnetprefix
-cfg_obj_islist
+cfg_acl_fromconfig
+cfg_aclconfctx_destroy
+cfg_aclconfctx_init
 cfg_list_first
 cfg_list_next
 cfg_listelt_value
-cfg_obj_istype
-cfg_obj_destroy
-cfg_obj_log
 cfg_log_init
-cfg_obj_line
+cfg_map_get
+cfg_map_getname
+cfg_obj_asboolean
+cfg_obj_asnetprefix
+cfg_obj_assockaddr
+cfg_obj_asstring
+cfg_obj_asuint32
+cfg_obj_asuint64
+cfg_obj_destroy
 cfg_obj_file
-
-
+cfg_obj_isboolean
+cfg_obj_islist
+cfg_obj_ismap
+cfg_obj_isnetprefix
+cfg_obj_issockaddr
+cfg_obj_isstring
+cfg_obj_istuple
+cfg_obj_istype
+cfg_obj_isuint32
+cfg_obj_isuint64
+cfg_obj_isvoid
+cfg_obj_line
+cfg_obj_log
+cfg_parse_buffer
+cfg_parse_file
+cfg_parser_create
+cfg_parser_destroy
+cfg_parser_setcallback
+cfg_tuple_get
 
 ; Exported Data
 
diff --git a/lib/isccfg/win32/libisccfg.dsp b/lib/isccfg/win32/libisccfg.dsp
index e6336c4cf0..d0a0bf5107 100644
--- a/lib/isccfg/win32/libisccfg.dsp
+++ b/lib/isccfg/win32/libisccfg.dsp
@@ -81,8 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../dns/win32/debug/libdns.lib
- ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../dns/win32/debug/libdns.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept
 
 !ENDIF 
 
diff --git a/lib/isccfg/win32/libisccfg.mak b/lib/isccfg/win32/libisccfg.mak
index 5f789991b3..e17ac84a62 100644
--- a/lib/isccfg/win32/libisccfg.mak
+++ b/lib/isccfg/win32/libisccfg.mak
@@ -102,12 +102,12 @@ ALL : "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
 
 !ELSE 
 
-ALL : "libdns - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
+ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" 
+CLEAN :"libisc - Win32 DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -141,6 +141,7 @@ BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc" 
 BSC32_SBRS= \
 	"$(INTDIR)\DLLMain.sbr" \
+	"$(INTDIR)\aclconf.sbr" \
 	"$(INTDIR)\log.sbr" \
 	"$(INTDIR)\parser.sbr" \
 	"$(INTDIR)\version.sbr" \
@@ -152,16 +153,17 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib  ../../dns/win32/debug/libdns.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../dns/win32/debug/libdns.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept 
 DEF_FILE= \
 	".\libisccfg.def"
 LINK32_OBJS= \
 	"$(INTDIR)\DLLMain.obj" \
+	"$(INTDIR)\aclconf.obj" \
 	"$(INTDIR)\log.obj" \
 	"$(INTDIR)\parser.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\namedconf.obj" \
-	"..\..\dns\win32\Debug\libdns.lib" \
+	"..\..\dns\win32\Debug\libdns.lib"
 	"..\..\isc\win32\Debug\libisc.lib"
 
 "..\..\..\Build\Debug\libisccfg.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -226,6 +228,24 @@ SOURCE=.\DLLMain.c
 "$(INTDIR)\DLLMain.obj"	"$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
 
 
+!ENDIF 
+
+SOURCE=..\aclconf.c
+
+!IF  "$(CFG)" == "libisccfg - Win32 Release"
+
+
+"$(INTDIR)\aclconf.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+
+
+"$(INTDIR)\aclconf.obj"	"$(INTDIR)\aclconf.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\log.c
diff --git a/util/kit.sh b/util/kit.sh
index ff80829973..7b0a153af0 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: kit.sh,v 1.27.18.1 2004/06/03 02:51:23 marka Exp $
+# $Id: kit.sh,v 1.27.18.2 2005/06/22 22:05:50 marka Exp $
 
 # Make a release kit
 #
@@ -126,6 +126,17 @@ chmod +x configure install-sh mkinstalldirs \
 	 lib/bind/configure lib/bind/mkinstalldirs \
 	 bin/tests/system/ifconfig.sh
 
+# Fix files which should be using DOS style newlines
+windirs=`find lib bin -type d -name win32`
+windirs="$windirs win32utils"
+winnames="-name *.mak -or -name *.dsp -or -name *.dsw -or -name *.txt -or -name *.bat"
+for f in `find $windirs -type f \( $winnames \) -print`
+do
+	awk '{sub("\r$", "", $0); printf("%s\r\n", $0);}' < $f > tmp
+	touch -r $f tmp
+	mv tmp $f
+done
+
 cd .. || exit 1
 
 kit=$topdir.tar.gz