diff --git a/tools/ports/freetype.py b/tools/ports/freetype.py
index 74f0b741c1d7f..7a9817a7eba4f 100644
--- a/tools/ports/freetype.py
+++ b/tools/ports/freetype.py
@@ -7,21 +7,19 @@
 import shutil
 from pathlib import Path
 
-TAG = 'version_1'
-HASH = '0d0b1280ba0501ad0a23cf1daa1f86821c722218b59432734d3087a89acd22aabd5c3e5e1269700dcd41e87073046e906060f167c032eb91a3ac8c5808a02783'
-
+TAG = '2.11.1'
+HASH = '610f2377e28cfa4b40db6155bec02b911a93171f0b37efc7d544787468e3e8193c588a381b4743c2206ffee74ea6cdd42ed949f1d7c474e3b123900d23db69e0'
 
 def needed(settings):
   return settings.USE_FREETYPE
 
-
 def get(ports, settings, shared):
-  ports.fetch_project('freetype', 'https://github.com/emscripten-ports/FreeType/archive/' + TAG + '.zip', 'FreeType-' + TAG, sha512hash=HASH)
+  ports.fetch_project('freetype', 'https://download.savannah.gnu.org/releases/freetype/freetype-' + TAG + '.tar.gz', 'freetype-' + TAG, sha512hash=HASH)
 
   def create(final):
     ports.clear_project_build('freetype')
 
-    source_path = os.path.join(ports.get_dir(), 'freetype', 'FreeType-' + TAG)
+    source_path = os.path.join(ports.get_dir(), 'freetype', 'freetype-' + TAG)
     dest_path = os.path.join(ports.get_build_dir(), 'freetype')
     shared.try_delete(dest_path)
     os.makedirs(dest_path)
@@ -45,6 +43,7 @@ def create(final):
             'src/base/ftgloadr.c',
             'src/base/ftglyph.c',
             'src/base/ftgxval.c',
+            'src/base/fthash.c',
             'src/base/ftinit.c',
             'src/base/ftlcdfil.c',
             'src/base/ftmm.c',
@@ -53,6 +52,7 @@ def create(final):
             'src/base/ftoutln.c',
             'src/base/ftpatent.c',
             'src/base/ftpfr.c',
+            'src/base/ftpsprop.c',
             'src/base/ftrfork.c',
             'src/base/ftsnames.c',
             'src/base/ftstream.c',
@@ -76,6 +76,10 @@ def create(final):
             'src/pshinter/pshinter.c',
             'src/psnames/psmodule.c',
             'src/raster/raster.c',
+            'src/sdf/ftbsdf.c',
+            'src/sdf/ftsdf.c',
+            'src/sdf/ftsdfcommon.c',
+            'src/sdf/ftsdfrend.c',
             'src/sfnt/sfnt.c',
             'src/smooth/smooth.c',
             'src/truetype/truetype.c',
diff --git a/tools/ports/zlib.py b/tools/ports/zlib.py
index 082720a8e6944..6a26b5092c86f 100644
--- a/tools/ports/zlib.py
+++ b/tools/ports/zlib.py
@@ -5,49 +5,31 @@
 
 import os
 import shutil
-from pathlib import Path
-
-VERSION = '1.2.11'
-HASH = 'a42b8359e76cf7b3ae70bf31f0f8a8caa407ac80e8fe08b838076cd5e45ac2e685dae45eb59db2d25543fb3b5bd13b843a02bb8373cda704d7238be50d5e9c68'
 
+VERSION = '1.2.13'
+HASH = '44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659'
 
 def needed(settings):
   return settings.USE_ZLIB
 
-
 def get(ports, settings, shared):
-  ports.fetch_project('zlib', f'https://storage.googleapis.com/webassembly/emscripten-ports/zlib-{VERSION}.zip', 'zlib-' + VERSION, sha512hash=HASH)
-
+  ports.fetch_project('zlib', 'https://github.com/madler/zlib/archive/refs/tags/v' + VERSION + '.zip', 'zlib-' + VERSION, sha512hash=HASH)
   def create(final):
     ports.clear_project_build('zlib')
-
     source_path = os.path.join(ports.get_dir(), 'zlib', 'zlib-' + VERSION)
-    dest_path = os.path.join(ports.get_build_dir(), 'zlib')
-    shared.try_delete(dest_path)
-    os.makedirs(dest_path)
-    shutil.rmtree(dest_path, ignore_errors=True)
-    shutil.copytree(source_path, dest_path)
-    Path(dest_path, 'zconf.h').write_text(zconf_h)
-    ports.install_headers(dest_path)
-
+    ports.write_file(os.path.join(source_path, 'zconf.h'), zconf_h)
+    ports.install_headers(source_path)
+    
     # build
     srcs = 'adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c'.split()
-    commands = []
-    o_s = []
-    for src in srcs:
-      o = os.path.join(dest_path, src + '.o')
-      shared.safe_ensure_dirs(os.path.dirname(o))
-      commands.append([shared.EMCC, os.path.join(dest_path, src), '-O2', '-o', o, '-I' + dest_path, '-w', '-c'])
-      o_s.append(o)
-    ports.run_commands(commands)
-
-    ports.create_lib(final, o_s)
+    flags = ['-Wno-deprecated-non-prototype']
+    ports.build_port(source_path, final, 'zlib', srcs=srcs, flags=flags)
 
   return [shared.Cache.get_lib('libz.a', create, what='port')]
 
 
 def clear(ports, settings, shared):
-  shared.Cache.erase_lib('libz.a')
+  shared.Cache.erase_file('libz.a')
 
 
 def process_args(ports):