diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index e34eb394cd..84f048534c 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.96 2009/07/19 04:18:05 each Exp $
+ * $Id: dnssec.c,v 1.97 2009/07/19 04:50:15 each Exp $
  */
 
 /*! \file */
@@ -1069,7 +1069,7 @@ get_hints(dns_dnsseckey_t *key) {
 		flags = dst_key_flags(key->key);
 		if ((flags & DNS_KEYFLAG_REVOKE) == 0) {
 			flags |= DNS_KEYFLAG_REVOKE;
-			dst_key_setflags(dstkey, flags);
+			dst_key_setflags(key->key, flags);
 		}
 	}
 
diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 810b19f6fa..4ed7c413b4 100644
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -116,6 +116,7 @@ dns_db_isstub
 dns_db_iszone
 dns_db_load
 dns_db_load2
+dns_db_load3
 dns_db_newversion
 dns_db_nodecount
 dns_db_ondestroy
@@ -190,6 +191,7 @@ dns_dlzstrtoargv
 dns_dlzunregister
 dns_dnssec_findzonekeys
 dns_dnssec_findzonekeys2
+dns_dnssec_findmatchingkeys
 dns_dnssec_keyfromrdata
 dns_dnssec_selfsigns
 dns_dnssec_sign
@@ -197,6 +199,8 @@ dns_dnssec_signmessage
 dns_dnssec_verify
 dns_dnssec_verify2
 dns_dnssec_verifymessage
+dns_dnsseckey_create
+dns_dnsseckey_destroy
 dns_ds_buildrdata
 dns_ds_digest_supported
 dns_dumpctx_detach
@@ -862,6 +866,7 @@ dst_key_fromgssapi
 dst_key_fromlabel
 dst_key_fromnamedfile
 dst_key_generate
+dst_key_gettime
 dst_key_id
 dst_key_isnullkey
 dst_key_isprivate
@@ -872,6 +877,7 @@ dst_key_proto
 dst_key_secretsize
 dst_key_setbits
 dst_key_setflags
+dst_key_settime
 dst_key_sigsize
 dst_key_size
 dst_key_tobuffer
diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw
index bd6a3d9212..eb1e4279e0 100644
--- a/win32utils/BINDBuild.dsw
+++ b/win32utils/BINDBuild.dsw
@@ -135,6 +135,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "settime"="..\bin\dnssec\win32\settime.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libdns
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libisc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name dnssectool
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "keygen"="..\bin\dnssec\win32\keygen.dsp" - Package Owner=<4>
 
 Package=<5>
diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index f3d040fe5b..62b55d0a22 100644
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -110,6 +110,7 @@ nmake /nologo -f signzone.mak CFG="signzone - Win32 Release"  NO_EXTERNAL_DEPS="
 nmake /nologo -f dsfromkey.mak CFG="dsfromkey - Win32 Release"  NO_EXTERNAL_DEPS="1"
 nmake /nologo -f keyfromlabel.mak CFG="keyfromlabel - Win32 Release"  NO_EXTERNAL_DEPS="1"
 nmake /nologo -f revoke.mak CFG="revoke - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f settime.mak CFG="settime - Win32 Release"  NO_EXTERNAL_DEPS="1"
 cd ..\..
 
 rem This is the BIND 9 Installer
diff --git a/win32utils/updatelibxml2.pl b/win32utils/updatelibxml2.pl
index d60c92575b..bb8ba0f79d 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.2 2009/07/17 06:25:45 each Exp $
+# $Id: updatelibxml2.pl,v 1.3 2009/07/19 04:50:15 each Exp $
 
 # updatelibxml2.pl
 # This script locates the latest version of libxml2 in the grandparent
@@ -55,6 +55,8 @@ $path = "..\\..\\";
              "../bin/dnssec/win32/keygen.mak",
              "../bin/dnssec/win32/revoke.dsp",
              "../bin/dnssec/win32/revoke.mak",
+             "../bin/dnssec/win32/settime.dsp",
+             "../bin/dnssec/win32/settime.mak",
              "../bin/dnssec/win32/signzone.dsp",
              "../bin/dnssec/win32/signzone.mak",
              "../bin/named/win32/named.dsp",