diff --git a/packages/m/mbedtls/xmake.lua b/packages/m/mbedtls/xmake.lua
index fbc863267..5b282c0c5 100644
--- a/packages/m/mbedtls/xmake.lua
+++ b/packages/m/mbedtls/xmake.lua
@@ -3,7 +3,7 @@ package("mbedtls")
     set_homepage("https://tls.mbed.org")
     set_description("An SSL library")
 
-    set_urls("https://github.com/ARMmbed/mbedtls/archive/mbedtls-$(version).zip", {excludes = "*/tests/*"})
+    set_urls("https://github.com/ARMmbed/mbedtls/archive/mbedtls-$(version).zip")
 
     add_versions("2.13.0", "6e747350bc13e8ff51799daa50f74230c6cd8e15977da55dd59f57b23dcf70a6")
     add_versions("2.7.6", "e527d828ab82650102ca8031302e5d4bc68ea887b2d84e43d3da2a80a9e5a2c8")
diff --git a/packages/o/openssl/xmake.lua b/packages/o/openssl/xmake.lua
index 121a98f56..9213d00c0 100644
--- a/packages/o/openssl/xmake.lua
+++ b/packages/o/openssl/xmake.lua
@@ -3,14 +3,16 @@ package("openssl")
     set_homepage("https://www.openssl.org/")
     set_description("A robust, commercial-grade, and full-featured toolkit for TLS and SSL.")
 
-    add_urls("https://www.openssl.org/source/openssl-$(version).tar.gz", {alias = "home"})
+    add_urls("https://www.openssl.org/source/openssl-$(version).tar.gz", {alias = "home", excludes = "*/fuzz/*"})
     add_urls("https://github.com/openssl/openssl/archive/OpenSSL_$(version).zip", 
-            {alias = "github", version = function (version) return version:gsub("%.", "_") end})
+            {alias = "github", version = function (version) return version:gsub("%.", "_") end, excludes = "*/fuzz/*"})
 
     add_versions("home:1.1.1", "2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d")
     add_versions("github:1.1.1", "7da8c193d3828a0cb4d866dc75622b2aac392971c3d656f7817fb84355290343")
 
     on_install("linux", "macosx", function (package)
-        import("package.tools.autoconf").install(package, {package:debug() and "--debug" or ""})
+        os.vrun("./config %s --prefix=\"%s\"", package:debug() and "--debug" or "", package:installdir())
+        os.vrun("make -j4")
+        os.vrun("make install")
     end)