diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 271c8a182e9..03a3734691b 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -6,10 +6,6 @@
 set(INPUT_freetype "undefined" CACHE STRING "")
 set_property(CACHE INPUT_freetype PROPERTY STRINGS undefined no qt system)
 
-# input harfbuzz
-set(INPUT_harfbuzz "undefined" CACHE STRING "")
-set_property(CACHE INPUT_harfbuzz PROPERTY STRINGS undefined no qt system)
-
 # input libjpeg
 set(INPUT_libjpeg "undefined" CACHE STRING "")
 set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system)
@@ -479,15 +475,9 @@ qt_feature("fontconfig" PUBLIC PRIVATE
 qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1")
 qt_feature("harfbuzz" PUBLIC PRIVATE
     LABEL "HarfBuzz"
+    CONDITION HARFBUZZ_FOUND
 )
 qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1")
-qt_feature("system_harfbuzz" PRIVATE
-    LABEL "  Using system HarfBuzz"
-    AUTODETECT NOT APPLE AND NOT WIN32
-    CONDITION QT_FEATURE_harfbuzz AND harfbuzz_FOUND
-    ENABLE INPUT_harfbuzz STREQUAL 'system'
-    DISABLE INPUT_harfbuzz STREQUAL 'qt'
-)
 qt_feature("qqnx_imf" PRIVATE
     LABEL "IMF"
     CONDITION libs.imf OR FIXME
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index a684130c684..efce7fee4a9 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -432,6 +432,8 @@ def parseInput(ctx, input, data, cm_fh):
 
         "gui",
 
+        "harfbuzz",
+
         "headersclean",
 
         "incredibuild-xge",
@@ -708,6 +710,9 @@ def parseFeature(ctx, feature, data, cm_fh):
             'disable': 'NOT TEST_posix_iconv OR TEST_iconv_needlib',
         },
         'GNUmake': None,
+        'harfbuzz': {
+            'condition': 'HARFBUZZ_FOUND'
+        },
         'host-dbus': None,
         'iconv': {
             'condition': 'NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )'
@@ -759,6 +764,7 @@ def parseFeature(ctx, feature, data, cm_fh):
         },
         'system-doubleconversion': None,  # No system libraries anymore!
         'system-freetype': None,
+        'system-harfbuzz': None,
         'system-jpeg': None,
         'system-pcre2': None,
         'system-png': None,