diff --git a/Makefile b/Makefile
index 97df4708..d56d7be4 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ $(DIST_DIR)/lib/libharfbuzz.a: build/lib/freetype/build_hb/dist_hb/lib/libfreety
 # Freetype with Harfbuzz
 $(DIST_DIR)/lib/libfreetype.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libbrotlidec.a
 	cd build/lib/freetype && \
-	EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
+	EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig:$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
 	emconfigure ./configure \
 		CFLAGS=" \
 		-s USE_PTHREADS=0 \
diff --git a/build/patches/fontconfig/0002-disable-pthreads.patch b/build/patches/fontconfig/0001-disable-pthreads.patch
similarity index 90%
rename from build/patches/fontconfig/0002-disable-pthreads.patch
rename to build/patches/fontconfig/0001-disable-pthreads.patch
index 7e529378..455eb4e7 100644
--- a/build/patches/fontconfig/0002-disable-pthreads.patch
+++ b/build/patches/fontconfig/0001-disable-pthreads.patch
@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index 394c281..1cb2f74 100644
+index 26b974a..b73d132 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -681,22 +681,8 @@ if $fc_cv_have_solaris_atomic_ops; then
+@@ -712,22 +712,8 @@ if $fc_cv_have_solaris_atomic_ops; then
  	AC_DEFINE(HAVE_SOLARIS_ATOMIC_OPS, 1, [Have Solaris __machine_*_barrier and atomic_* operations])
  fi
  
diff --git a/build/patches/fontconfig/0003-fix-fcstats-emscripten.patch b/build/patches/fontconfig/0003-fix-fcstats-emscripten.patch
deleted file mode 100644
index c55e4f27..00000000
--- a/build/patches/fontconfig/0003-fix-fcstats-emscripten.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/fcstat.c b/src/fcstat.c
-index 5aa1643..2a5ae3b 100644
---- a/src/fcstat.c
-+++ b/src/fcstat.c
-@@ -398,6 +398,8 @@ FcFStatFs (int fd, FcStatFS *statb)
- 	}
- 
- 	return ret;
-+#  elif EMSCRIPTEN
-+        return ret;
- #  else
- #    error "BUG: No way to figure out with fstatfs()"
- #  endif
-@@ -418,17 +420,24 @@ FcFStatFs (int fd, FcStatFS *statb)
- FcBool
- FcIsFsMmapSafe (int fd)
- {
-+#ifdef EMSCRIPTEN
-+  return FcFalse;
-+#else
-     FcStatFS statb;
- 
-     if (FcFStatFs (fd, &statb) < 0)
- 	return FcTrue;
- 
-     return !statb.is_remote_fs;
-+#endif
- }
- 
- FcBool
- FcIsFsMtimeBroken (const FcChar8 *dir)
- {
-+#ifdef EMSCRIPTEN
-+  	return FcFalse;
-+#else
-     int fd = FcOpen ((const char *) dir, O_RDONLY);
- 
-     if (fd != -1)
-@@ -444,6 +453,7 @@ FcIsFsMtimeBroken (const FcChar8 *dir)
-     }
- 
-     return FcFalse;
-+#endif
- }
- 
- #define __fcstat__
diff --git a/build/patches/freetype/0001-disable-exports.patch b/build/patches/freetype/0001-disable-exports.patch
deleted file mode 100644
index 77867572..00000000
--- a/build/patches/freetype/0001-disable-exports.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/builds/freetype.mk b/builds/freetype.mk
-index 111483069..734c3139a 100644
---- a/builds/freetype.mk
-+++ b/builds/freetype.mk
-@@ -169,7 +169,7 @@ FT_CFLAGS  = $(CPPFLAGS) \
- 
- # Include the `exports' rules file.
- #
--include $(TOP_DIR)/builds/exports.mk
-+#include $(TOP_DIR)/builds/exports.mk
- 
- 
- # Initialize the list of objects.
-diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
-index 5675866ea..5e77e3eff 100644
---- a/builds/unix/unix-cc.in
-+++ b/builds/unix/unix-cc.in
-@@ -115,7 +115,6 @@ CCexe        := $(CCraw_build)	# used to compile `apinames' only
- #
- LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-                           -rpath $(libdir) -version-info $(version_info) \
--                          $(LDFLAGS) -no-undefined \
--                          -export-symbols $(EXPORTS_LIST)
-+                          $(LDFLAGS) -no-undefined
- 
- # EOF
diff --git a/build/patches/harfbuzz/0002-disable-dependency-build.patch b/build/patches/harfbuzz/0002-disable-dependency-build.patch
deleted file mode 100644
index 18834911..00000000
--- a/build/patches/harfbuzz/0002-disable-dependency-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/src/harfbuzz.pc.in b/src/harfbuzz.pc.in
-index 661251c2..394f2735 100644
---- a/src/harfbuzz.pc.in
-+++ b/src/harfbuzz.pc.in
-@@ -9,5 +9,4 @@ Version: %VERSION%
- 
- Libs: -L${libdir} -lharfbuzz
- Libs.private: -lm %libs_private%
--Requires.private: %requires_private%
- Cflags: -I${includedir}/harfbuzz
diff --git a/build/patches/libass/.gitkeep b/build/patches/libass/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/fontconfig b/lib/fontconfig
index e291fda7..d37f9722 160000
--- a/lib/fontconfig
+++ b/lib/fontconfig
@@ -1 +1 @@
-Subproject commit e291fda7d42e5d64379555097a066d9c2c4efce3
+Subproject commit d37f97223a4715176c0889e91685dc796457e25f