diff --git a/bin/named/server.c b/bin/named/server.c
index 5703ea3207..ebed1194df 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.578 2010/08/11 18:14:18 each Exp $ */
+/* $Id: server.c,v 1.579 2010/08/13 14:33:31 fdupont Exp $ */
 
 /*! \file */
 
@@ -6752,12 +6752,13 @@ ns_server_add_zone(ns_server_t *server, char *args) {
 	 */
 	result = dns_zone_loadnew(zone);
 	if (result != ISC_R_SUCCESS) {
+		dns_db_t *dbp = NULL;
+
 		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 			      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
 			      "addzone failed; reverting.");
 
 		/* If the zone loaded partially, unload it */
-		dns_db_t *dbp = NULL;
 		if (dns_zone_getdb(zone, &dbp) == ISC_R_SUCCESS) {
 			dns_db_detach(&dbp);
 			dns_zone_unload(zone);
diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 4ef338f167..d13e4f81f7 100644
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -250,6 +250,7 @@ dns_keytable_delete
 dns_keytable_deletekeynode
 dns_keytable_detach
 dns_keytable_detachkeynode
+dns_keytable_dump
 dns_keytable_find
 dns_keytable_finddeepestmatch
 dns_keytable_findkeynode
@@ -702,10 +703,12 @@ dns_view_setcache2
 dns_view_setdstport
 dns_view_sethints
 dns_view_setkeyring
+dns_view_setnewzones
 dns_view_setresquerystats
 dns_view_setresstats
 dns_view_setrootdelonly
 dns_view_simplefind
+dns_view_thaw
 dns_view_weakattach
 dns_view_weakdetach
 dns_viewlist_find
@@ -734,6 +737,7 @@ dns_zone_flush
 dns_zone_forcereload
 dns_zone_forwardupdate
 dns_zone_fulldumptostream
+dns_zone_getadded
 dns_zone_getchecknames
 dns_zone_getclass
 dns_zone_getdb
@@ -778,6 +782,7 @@ dns_zone_idetach
 dns_zone_isforced
 dns_zone_load
 dns_zone_loadandthaw
+dns_zone_loadnew
 dns_zone_log
 dns_zone_maintenance
 dns_zone_markdirty
@@ -790,6 +795,7 @@ dns_zone_refresh
 dns_zone_rekey
 dns_zone_replacedb
 dns_zone_setacache
+dns_zone_setadded
 dns_zone_setalsonotify
 dns_zone_setaltxfrsource4
 dns_zone_setaltxfrsource6
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index adf0b42ed7..1316ffe104 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -58,6 +58,7 @@ isc__mem_getname
 isc__mem_getquota
 isc__mem_gettag
 isc__mem_inuse
+isc__mem_isovermem
 isc__mem_ondestroy
 isc__mem_references
 isc__mem_setdestroycheck
@@ -537,6 +538,7 @@ isc_thread_setconcurrency
 isc_time_add
 isc_time_compare
 isc_time_formatISO8601
+isc_time_formattimestamp
 isc_time_isepoch
 isc_time_microdiff
 isc_time_nanoseconds
diff --git a/lib/isccfg/win32/libisccfg.def b/lib/isccfg/win32/libisccfg.def
index 3afe090c48..0e7260e0ee 100644
--- a/lib/isccfg/win32/libisccfg.def
+++ b/lib/isccfg/win32/libisccfg.def
@@ -4,7 +4,8 @@ LIBRARY libisccfg
 EXPORTS
 
 cfg_acl_fromconfig
-cfg_aclconfctx_destroy
+cfg_aclconfctx_clear
+cfg_aclconfctx_clone
 cfg_aclconfctx_init
 cfg_list_first
 cfg_list_next
@@ -36,6 +37,7 @@ cfg_obj_line
 cfg_obj_log
 cfg_parse_buffer
 cfg_parse_file
+cfg_parser_attach
 cfg_parser_create
 cfg_parser_destroy
 cfg_parser_setcallback
diff --git a/win32utils/updatelibxml2.pl b/win32utils/updatelibxml2.pl
index bb8ba0f79d..ad00d6a939 100644
--- a/win32utils/updatelibxml2.pl
+++ b/win32utils/updatelibxml2.pl
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: updatelibxml2.pl,v 1.3 2009/07/19 04:50:15 each Exp $
+# $Id: updatelibxml2.pl,v 1.4 2010/08/13 14:33:31 fdupont Exp $
 
 # updatelibxml2.pl
 # This script locates the latest version of libxml2 in the grandparent
@@ -65,6 +65,8 @@ $path = "..\\..\\";
              "../bin/nsupdate/win32/nsupdate.mak",
              "../bin/rndc/win32/rndc.dsp",
              "../bin/rndc/win32/rndc.mak",
+             "../bin/tools/win32/journalprint.dsp",
+             "../bin/tools/win32/journalprint.mak",
              "../lib/bind9/win32/libbind9.dsp",
              "../lib/bind9/win32/libbind9.mak",
              "../lib/dns/win32/libdns.dsp",