diff --git a/packages/b/brotli/xmake.lua b/packages/b/brotli/xmake.lua
index 5d61e9266..163a5f332 100644
--- a/packages/b/brotli/xmake.lua
+++ b/packages/b/brotli/xmake.lua
@@ -69,7 +69,7 @@ package("brotli")
     end)
 
     on_test(function(package)
-        if package:is_plat(os.host()) then
+        if not package:is_cross() then
             os.vrun("brotli --version")
         end
         assert(package:check_csnippets([[
diff --git a/packages/h/hpsocket/port/xmake.lua b/packages/h/hpsocket/port/xmake.lua
index 5dc1d67b1..4ac43589e 100644
--- a/packages/h/hpsocket/port/xmake.lua
+++ b/packages/h/hpsocket/port/xmake.lua
@@ -39,9 +39,8 @@ option("unicode")
 option_end()
 
 option("hpversion")
-    set_default("v5.8.4")
+    set_default("v5.9.1")
     set_showmenu(true)
-    set_values("v5.7.3", "v5.8.4")
     set_category("option")
     set_description("The version of HP-Socket")
 option_end()
@@ -107,6 +106,10 @@ target("hpsocket")
         if     vs == "2015" then vs_ver = "14.0"
         elseif vs == "2017" then vs_ver = "15.0"
         elseif vs == "2019" then vs_ver = "16.0"
+        elseif vs == "2022" then vs_ver = "17.0"
+        end
+        if get_config("hpversion") == "v5.9.1" then
+            vs_ver = (vs == "2015" and "100" or "14x")
         end
 
         add_includedirs(".")
diff --git a/packages/h/hpsocket/xmake.lua b/packages/h/hpsocket/xmake.lua
index 5e22286e3..96df19bbd 100644
--- a/packages/h/hpsocket/xmake.lua
+++ b/packages/h/hpsocket/xmake.lua
@@ -5,9 +5,9 @@ package("hpsocket")
 
     add_urls("https://github.com/ldcsaa/HP-Socket/archive/$(version).tar.gz",
              "https://github.com/ldcsaa/HP-Socket.git")
-
     add_versions("v5.7.3", "e653f3c15ded3a4b622ab9a4a52a477c7aa40f5b86398c6b75f5a732a55496a0")
-    add_versions("v5.8.4", "21c4fa70c5619074c41d3065261de1828ec521dcb6eeec9d0640e93e67ae05a4")
+    add_versions("v5.8.4", "6fd207b84e41174c06d27c0df7244584eb07fbac0a7e49d7429103071184a451")
+    add_versions("v5.9.1", "d40a3d0b4f0d2773ae61d32ed95df655aa6ccf5ae22c40ef38bfc88882b2478b")
 
     local configs = {{name = "udp",    package = "kcp"},
                      {name = "http",   package = "http_parser"},
@@ -55,21 +55,21 @@ package("hpsocket")
         package:add("links", package:config("no_4c") and "hpsocket" or "hpsocket4c")
         if not package:config("shared") then
             if not package:config("no_ssl") then
-                local prefix = is_plat("windows") and "lib" or ""
+                local prefix = package:is_plat("windows") and "lib" or ""
                 package:add("links", prefix .. "ssl", prefix .. "crypto")
             end
             if not package:config("no_iconv") then
-                if is_plat("android") then
+                if package:is_plat("android") then
                     package:add("links", "iconv", "charset")
                 end
             end
-            if is_plat("linux") then
+            if package:is_plat("linux") then
                 package:add("links", "jemalloc_pic")
             end
         end
     end)
 
-    on_install("windows", "linux", "android", function (package)
+    on_install("windows|x64", "windows|x86", "linux", "android", function (package)
         os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua")
 
         local config = {}
diff --git a/packages/z/zlib/xmake.lua b/packages/z/zlib/xmake.lua
index 5c1879500..0ebc3dc5c 100644
--- a/packages/z/zlib/xmake.lua
+++ b/packages/z/zlib/xmake.lua
@@ -10,6 +10,8 @@ package("zlib")
     add_versions("v1.2.12", "d8688496ea40fb61787500e863cc63c9afcbc524468cedeb478068924eb54932")
     add_versions("v1.2.13", "1525952a0a567581792613a9723333d7f8cc20b87a81f920fb8bc7e3f2251428")
 
+    add_configs("zutil", {description = "Export zutil.h api", default = false, type = "boolean"})
+
     if is_plat("mingw") and is_subhost("msys") then
         add_extsources("pacman::zlib")
     elseif is_plat("linux") then
@@ -66,6 +68,9 @@ package("zlib")
             configs.cxflags = "-fPIC"
         end
         import("package.tools.xmake").install(package, configs)
+        if package:config("zutil") then
+            os.cp("zutil.h", package:installdir("include"))
+        end
     end)
 
     on_test(function (package)