diff --git a/scripts.d/25-freetype.sh b/scripts.d/45-fonts/25-freetype.sh
similarity index 83%
rename from scripts.d/25-freetype.sh
rename to scripts.d/45-fonts/25-freetype.sh
index ed12431..e99f596 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/45-fonts/25-freetype.sh
@@ -12,6 +12,7 @@ ffbuild_dockerbuild() {
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
+        --without-harfbuzz
         --disable-shared
         --enable-static
     )
@@ -29,11 +30,3 @@ ffbuild_dockerbuild() {
     make -j$(nproc)
     make install
 }
-
-ffbuild_configure() {
-    echo --enable-libfreetype
-}
-
-ffbuild_unconfigure() {
-    echo --disable-libfreetype
-}
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/45-fonts/35-fontconfig.sh
similarity index 100%
rename from scripts.d/35-fontconfig.sh
rename to scripts.d/45-fonts/35-fontconfig.sh
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-fonts/45-harfbuzz.sh
similarity index 90%
rename from scripts.d/45-harfbuzz.sh
rename to scripts.d/45-fonts/45-harfbuzz.sh
index a601cf1..199e82e 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-fonts/45-harfbuzz.sh
@@ -44,3 +44,8 @@ ffbuild_configure() {
     (( $(ffbuild_ffver) > 600 )) || return 0
     echo --enable-libharfbuzz
 }
+
+ffbuild_unconfigure() {
+    (( $(ffbuild_ffver) > 600 )) || return 0
+    echo --disable-libharfbuzz
+}
diff --git a/scripts.d/45-fonts/50-freetype.sh b/scripts.d/45-fonts/50-freetype.sh
new file mode 100755
index 0000000..d4836cc
--- /dev/null
+++ b/scripts.d/45-fonts/50-freetype.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
+SCRIPT_COMMIT="ab0fe6d55e8001eb2835af65381ab3626e382377"
+
+ffbuild_enabled() {
+    return 0
+}
+
+ffbuild_dockerbuild() {
+    ./autogen.sh
+
+    local myconf=(
+        --prefix="$FFBUILD_PREFIX"
+        --disable-shared
+        --enable-static
+    )
+
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
+        myconf+=(
+            --host="$FFBUILD_TOOLCHAIN"
+        )
+    else
+        echo "Unknown target"
+        return -1
+    fi
+
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
+
+    echo "Libs.private: -lharfbuzz" >> "$FFBUILD_PREFIX"/lib/pkgconfig/freetype2.pc
+}
+
+ffbuild_configure() {
+    echo --enable-libfreetype
+}
+
+ffbuild_unconfigure() {
+    echo --disable-libfreetype
+}