diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index f99fa56fbc..8485f6fed0 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1204,7 +1204,8 @@ dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) {
 				      DNS_LOGMODULE_MASTER, ISC_LOG_INFO,
 				      "catz: new zone version came too soon, "
 				      "deferring update");
-			isc_interval_set(&interval, 5 - tdiff, 0);
+			isc_interval_set(&interval,
+					 5 - (unsigned int)tdiff, 0);
 			zone->updatepending = ISC_TRUE;
 			dns_db_attach(db, &zone->db);
 			dns_db_currentversion(db, &zone->dbversion);
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index a0895deaaa..0deb37fe72 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -6658,8 +6658,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 
 		if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
 			newheader->attributes |= RDATASET_ATTR_RESIGN;
-			newheader->resign =
-				    dns_time64_from32(rdataset->resign) >> 1;
+			newheader->resign = (isc_stdtime_t)
+				(dns_time64_from32(rdataset->resign) >> 1);
 			newheader->resign_lsb = rdataset->resign & 0x1;
 		} else {
 			newheader->resign = 0;
@@ -6842,7 +6842,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	newheader->node = rbtnode;
 	if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
 		newheader->attributes |= RDATASET_ATTR_RESIGN;
-		newheader->resign = dns_time64_from32(rdataset->resign) >> 1;
+		newheader->resign = (isc_stdtime_t)
+			(dns_time64_from32(rdataset->resign) >> 1);
 		newheader->resign_lsb = rdataset->resign & 0x1;
 	} else {
 		newheader->resign = 0;
@@ -7257,7 +7258,8 @@ loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) {
 
 	if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
 		newheader->attributes |= RDATASET_ATTR_RESIGN;
-		newheader->resign = dns_time64_from32(rdataset->resign) >> 1;
+		newheader->resign = (isc_stdtime_t)
+			(dns_time64_from32(rdataset->resign) >> 1);
 		newheader->resign_lsb = rdataset->resign & 0x1;
 	} else {
 		newheader->resign = 0;
@@ -7925,7 +7927,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) {
 		  isc_rwlocktype_write);
 
 	oldresign = header->resign;
-	header->resign = dns_time64_from32(resign) >> 1;
+	header->resign = (isc_stdtime_t)(dns_time64_from32(resign) >> 1);
 	header->resign_lsb = resign & 0x1;
 	if (header->heap_index != 0) {
 		INSIST(RESIGN(header));
diff --git a/lib/dns/win32/libdns.dsp.in b/lib/dns/win32/libdns.dsp.in
index 14d98a5056..5580186b6f 100644
--- a/lib/dns/win32/libdns.dsp.in
+++ b/lib/dns/win32/libdns.dsp.in
@@ -130,6 +130,10 @@ SOURCE=..\include\dns\callbacks.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\dns\catz.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\dns\cert.h
 # End Source File
 # Begin Source File
@@ -228,6 +232,10 @@ SOURCE=..\include\dns\geoip.h
 @END GEOIP
 # Begin Source File
 
+SOURCE=..\include\dns\ipkeylist.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\dns\iptable.h
 # End Source File
 # Begin Source File
@@ -520,6 +528,10 @@ SOURCE=..\callbacks.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\catz.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\client.c
 # End Source File
 # Begin Source File
@@ -590,6 +602,10 @@ SOURCE=..\geoip.c
 @END GEOIP
 # Begin Source File
 
+SOURCE=..\ipkeylist.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\iptable.c
 # End Source File
 # Begin Source File
diff --git a/lib/dns/win32/libdns.mak.in b/lib/dns/win32/libdns.mak.in
index 97fd8b34f6..86129f79c7 100644
--- a/lib/dns/win32/libdns.mak.in
+++ b/lib/dns/win32/libdns.mak.in
@@ -154,6 +154,7 @@ CLEAN :
 	-@erase "$(INTDIR)\gssapictx.obj"
 	-@erase "$(INTDIR)\spnego.obj"
 	-@erase "$(INTDIR)\hmac_link.obj"
+	-@erase "$(INTDIR)\ipkeylist.obj"
 	-@erase "$(INTDIR)\iptable.obj"
 	-@erase "$(INTDIR)\journal.obj"
 	-@erase "$(INTDIR)\key.obj"
@@ -306,6 +307,7 @@ LINK32_OBJS= \
 @IF GEOIP
 	"$(INTDIR)\geoip.obj" \
 @END GEOIP
+	"$(INTDIR)\ipkeylist.obj" \
 	"$(INTDIR)\iptable.obj" \
 	"$(INTDIR)\journal.obj" \
 	"$(INTDIR)\keydata.obj" \
@@ -484,6 +486,8 @@ CLEAN :
 	-@erase "$(INTDIR)\spnego.sbr"
 	-@erase "$(INTDIR)\hmac_link.obj"
 	-@erase "$(INTDIR)\hmac_link.sbr"
+	-@erase "$(INTDIR)\ipkeylist.obj"
+	-@erase "$(INTDIR)\ipkeylist.sbr"
 	-@erase "$(INTDIR)\iptable.obj"
 	-@erase "$(INTDIR)\iptable.sbr"
 	-@erase "$(INTDIR)\journal.obj"
@@ -705,6 +709,7 @@ BSC32_SBRS= \
 @IF GEOIP
 	"$(INTDIR)\geoip.sbr" \
 @END GEOIP
+	"$(INTDIR)\ipkeylist.sbr" \
 	"$(INTDIR)\iptable.sbr" \
 	"$(INTDIR)\journal.sbr" \
 	"$(INTDIR)\keydata.sbr" \
@@ -823,6 +828,7 @@ LINK32_OBJS= \
 @IF GEOIP
 	"$(INTDIR)\geoip.obj" \
 @END GEOIP
+	"$(INTDIR)\ipkeylist.obj" \
 	"$(INTDIR)\iptable.obj" \
 	"$(INTDIR)\journal.obj" \
 	"$(INTDIR)\key.obj" \
@@ -1049,6 +1055,24 @@ SOURCE=..\callbacks.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\catz.c
+
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
+
+
+"$(INTDIR)\catz.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\catz.obj"	"$(INTDIR)\catz.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\client.c
@@ -1361,6 +1385,24 @@ SOURCE=..\geoip.c
 !ENDIF 
 @END GEOIP
 
+SOURCE=..\ipkeylist.c
+
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
+
+
+"$(INTDIR)\ipkeylist.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\ipkeylist.obj" "$(INTDIR)\ipkeylist.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
 SOURCE=..\iptable.c
 
 !IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
diff --git a/lib/dns/win32/libdns.vcxproj.filters.in b/lib/dns/win32/libdns.vcxproj.filters.in
index 17f51a507f..147a4d595b 100644
--- a/lib/dns/win32/libdns.vcxproj.filters.in
+++ b/lib/dns/win32/libdns.vcxproj.filters.in
@@ -51,6 +51,9 @@
     <ClCompile Include="..\callbacks.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\catz.c">
+      <Filter>Library Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\client.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
@@ -101,6 +104,9 @@
       <Filter>Library Source Files</Filter>
     </ClCompile>
 @END GEOIP
+    <ClCompile Include="..\ipkeylist.c">
+      <Filter>Library Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\iptable.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
@@ -371,6 +377,9 @@
     <ClInclude Include="..\include\dns\callbacks.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\dns\catz.h">
+      <Filter>Library Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\dns\cert.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
@@ -445,6 +454,9 @@
       <Filter>Library Header Files</Filter>
     </ClInclude>
 @END GEOIP
+    <ClInclude Include="..\include\dns\ipkeylist.h">
+      <Filter>Library Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\dns\iptable.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in
index a87d4f1030..d3cfa16c46 100644
--- a/lib/dns/win32/libdns.vcxproj.in
+++ b/lib/dns/win32/libdns.vcxproj.in
@@ -114,6 +114,7 @@
     <ClCompile Include="..\byaddr.c" />
     <ClCompile Include="..\cache.c" />
     <ClCompile Include="..\callbacks.c" />
+    <ClCompile Include="..\catz.c" />
     <ClCompile Include="..\client.c" />
     <ClCompile Include="..\clientinfo.c" />
     <ClCompile Include="..\compress.c" />
@@ -139,6 +140,7 @@
     <ClCompile Include="..\gssapictx.c" />
     <ClCompile Include="..\gssapi_link.c" />
     <ClCompile Include="..\hmac_link.c" />
+    <ClCompile Include="..\ipkeylist.c" />
     <ClCompile Include="..\iptable.c" />
     <ClCompile Include="..\journal.c" />
     <ClCompile Include="..\key.c" />
@@ -234,6 +236,7 @@
     <ClInclude Include="..\include\dns\byaddr.h" />
     <ClInclude Include="..\include\dns\cache.h" />
     <ClInclude Include="..\include\dns\callbacks.h" />
+    <ClInclude Include="..\include\dns\catz.h" />
     <ClInclude Include="..\include\dns\cert.h" />
     <ClInclude Include="..\include\dns\client.h" />
     <ClInclude Include="..\include\dns\clientinfo.h" />
@@ -260,6 +263,7 @@
 @IF GEOIP
     <ClInclude Include="..\include\dns\geoip.h" />
 @END GEOIP
+    <ClInclude Include="..\include\dns\ipkeylist.h" />
     <ClInclude Include="..\include\dns\iptable.h" />
     <ClInclude Include="..\include\dns\journal.h" />
     <ClInclude Include="..\include\dns\keydata.h" />
diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
index ad0af0a154..f90c0f7569 100644
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@@ -571,6 +571,7 @@ isc_sha224_init
 isc_sha224_invalidate
 isc_sha224_update
 isc_sha256_data
+isc_sha256_end
 isc_sha256_final
 isc_sha256_init
 isc_sha256_invalidate
diff --git a/lib/isc/win32/libisc.dsp.in b/lib/isc/win32/libisc.dsp.in
index c6ec1b0f66..955f71bbe7 100644
--- a/lib/isc/win32/libisc.dsp.in
+++ b/lib/isc/win32/libisc.dsp.in
@@ -341,6 +341,10 @@ SOURCE=..\include\isc\hmacsha.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\isc\ht.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\isc\httpd.h
 # End Source File
 # Begin Source File
@@ -745,6 +749,10 @@ SOURCE=..\hmacsha.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\ht.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\httpd.c
 # End Source File
 # Begin Source File
diff --git a/lib/isc/win32/libisc.mak.in b/lib/isc/win32/libisc.mak.in
index 709d7e8cea..7171b39f24 100644
--- a/lib/isc/win32/libisc.mak.in
+++ b/lib/isc/win32/libisc.mak.in
@@ -143,6 +143,7 @@ CLEAN :
 	-@erase "$(INTDIR)\hex.obj"
 	-@erase "$(INTDIR)\hmacmd5.obj"
 	-@erase "$(INTDIR)\hmacsha.obj"
+	-@erase "$(INTDIR)\ht.obj"
 	-@erase "$(INTDIR)\httpd.obj"
 	-@erase "$(INTDIR)\inet_aton.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
@@ -281,6 +282,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\hex.obj" \
 	"$(INTDIR)\hmacmd5.obj" \
 	"$(INTDIR)\hmacsha.obj" \
+	"$(INTDIR)\ht.obj" \
 	"$(INTDIR)\httpd.obj" \
 	"$(INTDIR)\inet_aton.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
@@ -399,6 +401,8 @@ CLEAN :
 	-@erase "$(INTDIR)\hmacmd5.sbr"
 	-@erase "$(INTDIR)\hmacsha.obj"
 	-@erase "$(INTDIR)\hmacsha.sbr"
+	-@erase "$(INTDIR)\ht.obj"
+	-@erase "$(INTDIR)\ht.sbr"
 	-@erase "$(INTDIR)\httpd.obj"
 	-@erase "$(INTDIR)\httpd.sbr"
 	-@erase "$(INTDIR)\inet_aton.obj"
@@ -594,6 +598,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\hex.sbr" \
 	"$(INTDIR)\hmacmd5.sbr" \
 	"$(INTDIR)\hmacsha.sbr" \
+	"$(INTDIR)\ht.sbr" \
 	"$(INTDIR)\httpd.sbr" \
 	"$(INTDIR)\inet_aton.sbr" \
 	"$(INTDIR)\inet_ntop.sbr" \
@@ -699,6 +704,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\hex.obj" \
 	"$(INTDIR)\hmacmd5.obj" \
 	"$(INTDIR)\hmacsha.obj" \
+	"$(INTDIR)\ht.obj" \
 	"$(INTDIR)\httpd.obj" \
 	"$(INTDIR)\inet_aton.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
@@ -1569,6 +1575,24 @@ SOURCE=..\hmacsha.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF
+
+SOURCE=..\ht.c
+
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
+
+
+"$(INTDIR)\ht.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\ht.obj"	"$(INTDIR)\ht.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF
 
 SOURCE=..\httpd.c
diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in
index 997979a8e1..e9938b35c6 100644
--- a/lib/isc/win32/libisc.vcxproj.filters.in
+++ b/lib/isc/win32/libisc.vcxproj.filters.in
@@ -103,6 +103,9 @@
     <ClInclude Include="..\include\isc\hmacsha.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\isc\ht.h">
+      <Filter>Library Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\isc\httpd.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
@@ -531,6 +534,9 @@
     <ClCompile Include="..\hmacsha.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\ht.c">
+      <Filter>Library Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\httpd.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in
index 2b7049d2ad..a7cc5d8d7d 100644
--- a/lib/isc/win32/libisc.vcxproj.in
+++ b/lib/isc/win32/libisc.vcxproj.in
@@ -321,6 +321,7 @@ copy InstallFiles ..\Build\Release\
     <ClInclude Include="..\include\isc\hex.h" />
     <ClInclude Include="..\include\isc\hmacmd5.h" />
     <ClInclude Include="..\include\isc\hmacsha.h" />
+    <ClInclude Include="..\include\isc\ht.h" />
     <ClInclude Include="..\include\isc\httpd.h" />
     <ClInclude Include="..\include\isc\interfaceiter.h" />
     <ClInclude Include="..\include\isc\iterated_hash.h" />
@@ -443,6 +444,7 @@ copy InstallFiles ..\Build\Release\
     <ClCompile Include="..\hex.c" />
     <ClCompile Include="..\hmacmd5.c" />
     <ClCompile Include="..\hmacsha.c" />
+    <ClCompile Include="..\ht.c" />
     <ClCompile Include="..\httpd.c" />
     <ClCompile Include="..\inet_aton.c" />
     <ClCompile Include="..\inet_ntop.c" />
diff --git a/win32utils/Configure b/win32utils/Configure
index 4fb2ae07ea..7fd1a5d0c5 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -3129,6 +3129,7 @@ exit 0;
 #  --enable-full-report supported by verbose
 #  --enable-dnstap not supported (requires libfstrm support on WIN32)
 #  --enable-seccomp not supported (Linux specific)
+#  --enable-afl not supported (not yet considered on WIN32)
 #  --with-python supported
 #  --with-openssl supported
 #  --with-pkcs11 supported