diff --git a/cairo/build.gradle.kts b/cairo/build.gradle.kts
index 9fac5e1..11013e9 100644
--- a/cairo/build.gradle.kts
+++ b/cairo/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "1.18.0"
 
 group = rootProject.group
-version = "${portVersion}-beta-2"
+version = "${portVersion}-beta-3"
 
 plugins {
     id("maven-publish")
@@ -16,11 +16,11 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:pixman${ndkVersionSuffix}-static:0.42.2-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-2")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-3")
 //    Run-time dependency libspectre found: NO (tried pkgconfig and cmake) - CAIRO_CAN_TEST_PS_SURFACE
 //    Run-time dependency poppler-glib found: NO (tried pkgconfig and cmake) - CAIRO_CAN_TEST_PDF_SURFACE
 //    Run-time dependency librsvg-2.0 found: NO (tried pkgconfig and cmake) - CAIRO_CAN_TEST_SVG_SURFACE
@@ -59,6 +59,14 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mapOf(
+        "fontconfig" to "1",
+        "freetype" to "1",
+        "glib2" to "1",
+        "pixman" to "1",
+        "libpng" to "1",
+    ))
+
     modules {
         create("cairo") {
             static.set(project.findProperty("libraryType") == "static")
diff --git a/fontconfig/build.gradle.kts b/fontconfig/build.gradle.kts
index 71b4625..377ebb7 100644
--- a/fontconfig/build.gradle.kts
+++ b/fontconfig/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "2.14.2"
 
 group = rootProject.group
-version = "${portVersion}-beta-2"
+version = "${portVersion}-beta-3"
 
 plugins {
     id("maven-publish")
@@ -16,7 +16,7 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:libexpat${ndkVersionSuffix}-static:2.5.0-beta-3")
 }
@@ -68,6 +68,12 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mapOf(
+        "libexpat" to "1",
+        "freetype" to "1",
+        "libpng" to "1",
+    ))
+
     modules {
         create("fontconfig") {
             static.set(project.findProperty("libraryType") == "static")
diff --git a/fontforge/build.gradle.kts b/fontforge/build.gradle.kts
index 98840f8..a4562e7 100644
--- a/fontforge/build.gradle.kts
+++ b/fontforge/build.gradle.kts
@@ -11,15 +11,15 @@ group = rootProject.group
 // Hardcode a list of available versions
 val portVersion = when(project.findProperty("packageVersion")) {
     "20170731" -> {
-        version = "20170731-beta-3"
+        version = "20170731-beta-4"
         "20170731"
     }
     "20200314" -> {
-        version = "20200314-beta-3"
+        version = "20200314-beta-4"
         "20200314"
     }
     else /* "20230101" */ -> {
-        version = "20230101-beta-3"
+        version = "20230101-beta-4"
         "20230101"
     }
 }
@@ -39,26 +39,26 @@ val minSupportedSdk = when (portVersion) {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:proxy-libintl${ndkVersionSuffix}-static:0.4.1.1")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
     implementation("com.viliussutkus89.ndk.thirdparty:libjpeg-turbo${ndkVersionSuffix}-static:3.0.1-beta-2")
     implementation("com.viliussutkus89.ndk.thirdparty:libtool${ndkVersionSuffix}-static:2.4.6-beta-2")
     implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:libuninameslist${ndkVersionSuffix}-static:20230916-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:libxml2${ndkVersionSuffix}-static:2.11.5-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:libxml2${ndkVersionSuffix}-static:2.11.5-beta-4")
     implementation("com.viliussutkus89.ndk.thirdparty:spiro${ndkVersionSuffix}-static:20221101-beta-2")
 
     if (minSupportedSdk >= 21)
-        implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.51.0-beta-2")
+        implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.51.0-beta-3")
     else
-        implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.49.4-beta-2")
+        implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.49.4-beta-3")
 
     if (portVersion != "20170731") {
         // libfontforge checks for TIFFRewriteField , which was deprecated in libtiff-4
         // http://www.simplesystems.org/libtiff/v4.0.0.html
-        implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-3")
+        implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-4")
     }
 
     // -- Could NOT find GIF (missing: GIF_LIBRARY GIF_INCLUDE_DIR)
@@ -302,17 +302,35 @@ when (portVersion) {
     }
 }
 
-
 tasks.prefabPackage {
     version.set(CMakeCompatibleVersion.parse(portVersion))
 
     licensePath.set("LICENSE")
 
+    dependencies.set(mutableMapOf(
+        "cairo" to "1",
+        "freetype" to "1",
+        "proxy-libintl" to "1",
+        "glib2" to "1",
+        "libjpeg-turbo" to "1",
+        "libtool" to "1",
+        "libpng" to "1",
+        "libuninameslist" to "1",
+        "libxml2" to "1",
+        "spiro" to "1",
+        "pango" to "1",
+    ).apply {
+        if (portVersion != "20170731") {
+            put("libtiff", "1")
+        }
+    })
+
     modules {
+        val isStatic = project.findProperty("libraryType") == "static"
         when (portVersion) {
             "20170731" -> {
                 create("fontforge") {
-                    static.set(project.findProperty("libraryType") == "static")
+                    static.set(isStatic)
                     includesPerAbi.set(true)
                     dependencies.set(listOf(
                         ":gioftp",
@@ -320,7 +338,7 @@ tasks.prefabPackage {
                         ":gunicode",
                         "z",
                         "m",
-                        "//libtool:tool",
+                        "//libtool:ltdl",
                         "//libjpeg-turbo:jpeg",
                         "//libpng:png16",
                         "//spiro:spiro",
@@ -328,13 +346,13 @@ tasks.prefabPackage {
                         "//freetype:freetype",
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
-                        "//libxml2:xml-2.0",
-                        "//pango:pango",
+                        "//libxml2:xml2",
+                        "//pango:pango-1.0",
                         "//cairo:cairo",
                     ))
                 }
                 create("fontforgeexe") {
-                    static.set(project.findProperty("libraryType") == "static")
+                    static.set(isStatic)
                     includesPerAbi.set(true)
                     dependencies.set(listOf(
                         ":fontforge",
@@ -343,7 +361,7 @@ tasks.prefabPackage {
                         ":gunicode",
                         "z",
                         "m",
-                        "//libtool:tool",
+                        "//libtool:ltdl",
                         "//libjpeg-turbo:jpeg",
                         "//libpng:png16",
                         "//spiro:spiro",
@@ -351,33 +369,33 @@ tasks.prefabPackage {
                         "//freetype:freetype",
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
-                        "//libxml2:xml-2.0",
-                        "//pango:pango",
+                        "//libxml2:xml2",
+                        "//pango:pango-1.0",
                         "//cairo:cairo",
                     ))
                 }
                 create("gioftp") {
-                    static.set(project.findProperty("libraryType") == "static")
+                    static.set(isStatic)
                     includesPerAbi.set(true)
                 }
                 create("gunicode") {
-                    static.set(project.findProperty("libraryType") == "static")
+                    static.set(isStatic)
                     includesPerAbi.set(true)
                 }
                 create("gutils") {
-                    static.set(project.findProperty("libraryType") == "static")
+                    static.set(isStatic)
                     includesPerAbi.set(true)
                 }
             }
             "20200314" -> {
                 // @TODO: this could be wrong, because no pkg-config.pc to verify
                 create("fontforge") {
-                    static.set(project.findProperty("libraryType") == "static")
+                    static.set(isStatic)
                     includesPerAbi.set(true)
                     dependencies.set(listOf(
                         "z",
                         "m",
-                        "//libtool:tool",
+                        "//libtool:ltdl",
                         "//libjpeg-turbo:jpeg",
                         "//libpng:png16",
                         "//spiro:spiro",
@@ -385,8 +403,8 @@ tasks.prefabPackage {
                         "//freetype:freetype",
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
-                        "//libxml2:xml-2.0",
-                        "//pango:pango",
+                        "//libxml2:xml2",
+                        "//pango:pango-1.0",
                         "//cairo:cairo",
                         "//libtiff:tiff",
                     ))
@@ -395,12 +413,12 @@ tasks.prefabPackage {
             "20230101" -> {
                 // @TODO: this could be wrong, because no pkg-config.pc to verify
                 create("fontforge") {
-                    static.set(project.findProperty("libraryType") == "static")
+                    static.set(isStatic)
                     includesPerAbi.set(true)
                     dependencies.set(listOf(
                         "z",
                         "m",
-                        "//libtool:tool",
+                        "//libtool:ltdl",
                         "//libjpeg-turbo:jpeg",
                         "//libpng:png16",
                         "//spiro:spiro",
@@ -408,8 +426,8 @@ tasks.prefabPackage {
                         "//freetype:freetype",
                         "//proxy-libintl:intl",
                         "//glib2:gio-2.0",
-                        "//libxml2:xml-2.0",
-                        "//pango:pango",
+                        "//libxml2:xml2",
+                        "//pango:pango-1.0",
                         "//cairo:cairo",
                         "//libtiff:tiff",
                     ))
diff --git a/freetype/build.gradle.kts b/freetype/build.gradle.kts
index 2149825..2f6fc87 100644
--- a/freetype/build.gradle.kts
+++ b/freetype/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "2.13.2"
 
 group = rootProject.group
-version = "${portVersion}-beta-4"
+version = "${portVersion}-beta-5"
 
 plugins {
     id("maven-publish")
@@ -42,6 +42,8 @@ tasks.prefabPackage {
 
     licensePath.set("LICENSE.TXT")
 
+    dependencies.set(mapOf("libpng" to "1"))
+
     modules {
         create("freetype") {
             static.set(project.findProperty("libraryType") == "static")
diff --git a/glib2/build.gradle.kts b/glib2/build.gradle.kts
index b98a9f2..c0be957 100644
--- a/glib2/build.gradle.kts
+++ b/glib2/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "2.78.1"
 
 group = rootProject.group
-version = "${portVersion}-beta-3"
+version = "${portVersion}-beta-4"
 
 plugins {
     id("maven-publish")
@@ -120,6 +120,13 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mapOf(
+        "libiconv" to "1",
+        "proxy-libintl" to "1",
+        "libffi" to "1",
+        "pcre2" to "1",
+    ))
+
     modules {
         val isStatic = project.findProperty("libraryType") == "static"
         create("glib-2.0") {
diff --git a/harfbuzz/build.gradle.kts b/harfbuzz/build.gradle.kts
index f968b8b..ee20247 100644
--- a/harfbuzz/build.gradle.kts
+++ b/harfbuzz/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "8.2.2"
 
 group = rootProject.group
-version = "${portVersion}-beta-2"
+version = "${portVersion}-beta-3"
 
 plugins {
     id("maven-publish")
@@ -16,10 +16,10 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
 }
 
 ndkPorts {
@@ -61,9 +61,17 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mapOf(
+        "cairo" to "1",
+        "fontconfig" to "1",
+        "freetype" to "1",
+        "glib2" to "1",
+    ))
+
     modules {
+        val isStatic = project.findProperty("libraryType") == "static"
         create("harfbuzz") {
-            static.set(project.findProperty("libraryType") == "static")
+            static.set(isStatic)
             dependencies.set(listOf(
                 "m",
                 "//freetype:freetype",
@@ -71,7 +79,7 @@ tasks.prefabPackage {
             ))
         }
         create("harfbuzz-cairo") {
-            static.set(project.findProperty("libraryType") == "static")
+            static.set(isStatic)
             dependencies.set(listOf(
                 "m",
                 ":harfbuzz",
@@ -81,7 +89,7 @@ tasks.prefabPackage {
             ))
         }
         create("harfbuzz-gobject") {
-            static.set(project.findProperty("libraryType") == "static")
+            static.set(isStatic)
             dependencies.set(listOf(
                 ":harfbuzz",
                 "//glib2:glib-2.0",
@@ -89,7 +97,7 @@ tasks.prefabPackage {
             ))
         }
         create("harfbuzz-subset") {
-            static.set(project.findProperty("libraryType") == "static")
+            static.set(isStatic)
             dependencies.set(listOf(
                 "m",
                 ":harfbuzz",
diff --git a/json-glib/build.gradle.kts b/json-glib/build.gradle.kts
index b9d1a28..8325de5 100644
--- a/json-glib/build.gradle.kts
+++ b/json-glib/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "1.8.0"
 
 group = rootProject.group
-version = "${portVersion}-beta-2"
+version = "${portVersion}-beta-3"
 
 plugins {
     id("maven-publish")
@@ -16,7 +16,7 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
 }
 
 ndkPorts {
@@ -38,6 +38,8 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mapOf("glib2" to "1"))
+
     modules {
         create("json-glib-1.0") {
             static.set(project.findProperty("libraryType") == "static")
diff --git a/lcms2/build.gradle.kts b/lcms2/build.gradle.kts
index 607890b..ff1bc9b 100644
--- a/lcms2/build.gradle.kts
+++ b/lcms2/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "2.15"
 
 group = rootProject.group
-version = "${portVersion}-beta-3"
+version = "${portVersion}-beta-4"
 
 plugins {
     id("maven-publish")
@@ -17,7 +17,7 @@ plugins {
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
     implementation("com.viliussutkus89.ndk.thirdparty:libjpeg-turbo${ndkVersionSuffix}-static:3.0.1-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-4")
 }
 
 ndkPorts {
@@ -39,6 +39,11 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mapOf(
+        "libjpeg-turbo" to "1",
+        "libtiff" to "1",
+    ))
+
     modules {
         create("lcms2") {
             static.set(project.findProperty("libraryType") == "static")
diff --git a/libtiff/build.gradle.kts b/libtiff/build.gradle.kts
index 1ff0d4d..5f82e2b 100644
--- a/libtiff/build.gradle.kts
+++ b/libtiff/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "4.6.0"
 
 group = rootProject.group
-version = "${portVersion}-beta-3"
+version = "${portVersion}-beta-4"
 
 plugins {
     id("maven-publish")
@@ -44,6 +44,7 @@ tasks.prefabPackage {
 
     licensePath.set("LICENSE.md")
 
+    dependencies.set(mapOf("libjpeg-turbo" to "1"))
     modules {
         val isStatic = project.findProperty("libraryType") == "static"
         create("tiff") {
diff --git a/libxml2/build.gradle.kts b/libxml2/build.gradle.kts
index 6f1b020..8cfd201 100644
--- a/libxml2/build.gradle.kts
+++ b/libxml2/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "2.11.5"
 
 group = rootProject.group
-version = "${portVersion}-beta-3"
+version = "${portVersion}-beta-4"
 
 plugins {
     id("maven-publish")
@@ -46,6 +46,7 @@ tasks.prefabPackage {
     version.set(CMakeCompatibleVersion.parse(portVersion))
 
     licensePath.set("Copyright")
+    dependencies.set(mapOf("libiconv" to "1"))
 
     modules {
         create("xml2") {
diff --git a/pango/build.gradle.kts b/pango/build.gradle.kts
index 50d9fb1..59da989 100644
--- a/pango/build.gradle.kts
+++ b/pango/build.gradle.kts
@@ -8,11 +8,11 @@ group = rootProject.group
 // Hardcode a list of available versions
 val portVersion = when(project.findProperty("packageVersion")) {
     "1.49.4" -> {
-        version = "1.49.4-beta-2"
+        version = "1.49.4-beta-3"
         "1.49.4"
     }
     else /* "1.51.0" */-> {
-        version = "1.51.0-beta-2"
+        version = "1.51.0-beta-3"
         "1.51.0"
     }
 }
@@ -25,17 +25,17 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:fribidi${ndkVersionSuffix}-static:1.0.13-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:harfbuzz${ndkVersionSuffix}-static:8.2.2-beta-2")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:harfbuzz${ndkVersionSuffix}-static:8.2.2-beta-3")
 
     // Only needed for 1.49.4
     // https://gitlab.gnome.org/GNOME/pango/-/commit/32115334662799c77d49b0e26161c44e580d5dd4
     if (portVersion == "1.49.4") {
-        implementation("com.viliussutkus89.ndk.thirdparty:json-glib${ndkVersionSuffix}-static:1.8.0-beta-2")
+        implementation("com.viliussutkus89.ndk.thirdparty:json-glib${ndkVersionSuffix}-static:1.8.0-beta-3")
     }
 }
 
@@ -63,6 +63,19 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mutableMapOf(
+        "cairo" to "1",
+        "fontconfig" to "1",
+        "freetype" to "1",
+        "fribidi" to "1",
+        "glib2" to "1",
+        "harfbuzz" to "1",
+    ).apply {
+        if (portVersion == "1.49.4") {
+            put("json-glib", "1")
+        }
+    })
+
     modules {
         create("pango-1.0") {
             static.set(project.findProperty("libraryType") == "static")
diff --git a/pdf2htmlEX/build.gradle.kts b/pdf2htmlEX/build.gradle.kts
index 217a362..5c778c0 100644
--- a/pdf2htmlEX/build.gradle.kts
+++ b/pdf2htmlEX/build.gradle.kts
@@ -25,17 +25,17 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
 
     when (portVersion) {
         "0.18.7-poppler-0.81.0" -> {
-            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20170731-beta-3")
-            implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}-static:0.81.0-beta-2")
+            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20170731-beta-4")
+            implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}-static:0.81.0-beta-3")
         }
         "0.18.8.rc1" -> {
-            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20200314-beta-3")
-            implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}-static:0.89.0-beta-2")
+            implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}-static:20200314-beta-4")
+            implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}-static:0.89.0-beta-3")
         }
     }
 }
@@ -134,6 +134,13 @@ tasks.prefabPackage {
 
     licensePath.set("LICENSE")
 
+    dependencies.set(mapOf(
+        "cairo" to "1",
+        "freetype" to "1",
+        "fontforge" to "1",
+        "poppler" to "1",
+    ))
+
     modules {
         create("pdf2htmlEX") {
             static.set(project.findProperty("libraryType") == "static")
diff --git a/poppler/build.gradle.kts b/poppler/build.gradle.kts
index 7ee1bfd..42ae48d 100644
--- a/poppler/build.gradle.kts
+++ b/poppler/build.gradle.kts
@@ -8,19 +8,19 @@ group = rootProject.group
 // Hardcode a list of available versions
 val portVersion = when(project.findProperty("packageVersion")) {
     "0.81.0" -> {
-        version = "0.81.0-beta-2"
+        version = "0.81.0-beta-3"
         "0.81.0"
     }
     "0.89.0" -> {
-        version = "0.89.0-beta-2"
+        version = "0.89.0-beta-3"
         "0.89.0"
     }
     "21.02.0" -> {
-        version = "21.02.0-beta-2"
+        version = "21.02.0-beta-3"
         "21.02.0"
     }
     else /* "23.10.0" */ -> {
-        version = "23.10.0-beta-2"
+        version = "23.10.0-beta-3"
         "23.10.0"
     }
 }
@@ -33,19 +33,19 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:libiconv${ndkVersionSuffix}-static:1.17-beta-2")
     implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
     implementation("com.viliussutkus89.ndk.thirdparty:libjpeg-turbo${ndkVersionSuffix}-static:3.0.1-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-4")
     implementation("com.viliussutkus89.ndk.thirdparty:openjpeg${ndkVersionSuffix}-static:2.5.0-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:lcms2${ndkVersionSuffix}-static:2.15-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:lcms2${ndkVersionSuffix}-static:2.15-beta-4")
 
     if (listOf("0.81.0", "0.89.0", "21.02.0").contains(portVersion)) {
         // 23.10.0 supports Android's native alternative of fontconfig
-        implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-2")
+        implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-3")
     }
 }
 
@@ -162,10 +162,26 @@ tasks.prefabPackage {
 
     licensePath.set("COPYING")
 
+    dependencies.set(mutableMapOf(
+        "freetype" to "1",
+        "libiconv" to "1",
+        "libpng" to "1",
+        "libjpeg-turbo" to "1",
+        "libtiff" to "1",
+        "openjpeg" to "1",
+        "glib2" to "1",
+        "cairo" to "1",
+        "lcms2" to "1",
+    ).apply {
+        if (listOf("0.81.0", "0.89.0", "21.02.0").contains(portVersion)) {
+            put("fontconfig", "1")
+        }
+    })
+
     modules {
         create("poppler") {
             static.set(project.findProperty("libraryType") == "static")
-            dependencies.set(listOf(
+            dependencies.set(mutableListOf(
                 "//freetype:freetype",
                 "//libpng:png16",
                 "//libjpeg-turbo:turbojpeg",
@@ -174,8 +190,11 @@ tasks.prefabPackage {
                 "//glib2:glib-2.0",
                 "//cairo:cairo",
                 "//lcms2:lcms2",
-                "//fontconfig:fontconfig",
-            ))
+            ).apply {
+                if (listOf("0.81.0", "0.89.0", "21.02.0").contains(portVersion)) {
+                    add("//fontconfig:fontconfig")
+                }
+            })
         }
         create("poppler-cpp") {
             static.set(project.findProperty("libraryType") == "static")