--- old/make/modules/java.desktop/lib/Awt2dLibraries.gmk	2020-08-10 13:34:03.594443730 -0700
+++ new/make/modules/java.desktop/lib/Awt2dLibraries.gmk	2020-08-10 13:34:03.298443735 -0700
@@ -456,10 +456,10 @@
     HARFBUZZ_CFLAGS += -DHAVE_CORETEXT
   endif
   ifeq ($(call isTargetOs, macosx), false)
-    LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
+    LIBHARFBUZZ_EXCLUDE_FILES += libharfbuzz/hb-coretext.cc
   endif
   # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
-  LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-ft.cc
+  LIBHARFBUZZ_EXCLUDE_FILES += libharfbuzz/hb-ft.cc
 
   LIBHARFBUZZ_CFLAGS += $(HARFBUZZ_CFLAGS)
 
--- old/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java	2020-08-10 13:34:04.226443720 -0700
+++ new/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java	2020-08-10 13:34:03.946443725 -0700
@@ -53,6 +53,8 @@
                       NB: consider moving freetype wrapper part to separate
                           shared library in order to avoid dependency. */
                    System.loadLibrary("freetype");
+                   /* Same for harfbuzz */
+                   System.loadLibrary("harfbuzz");
                }
                System.loadLibrary("fontmanager");