diff --git a/config.sh b/config.sh
index d8b4fa41d7..249a7150fd 100755
--- a/config.sh
+++ b/config.sh
@@ -69,4 +69,4 @@ elif is_wsl_accessing_windows; then
 fi
 
 # Launch meson
-"${MESON:-meson}" setup --native-file=meson/"$native_file" --native-file="$build/root.ini" --cross-file=meson/"$cross_file" --cross-file="$build/root.ini" "$@" -- "$build"
+"${MESON:-meson}" setup -Dnitrogfx:native=true --native-file=meson/"$native_file" --native-file="$build/root.ini" --cross-file=meson/"$cross_file" --cross-file="$build/root.ini" "$@" -- "$build"
diff --git a/subprojects/nitrogfx.wrap b/subprojects/nitrogfx.wrap
index 6abba70289..b4e897d103 100644
--- a/subprojects/nitrogfx.wrap
+++ b/subprojects/nitrogfx.wrap
@@ -2,4 +2,6 @@
 url = https://github.com/red031000/nitrogfx.git
 revision = head
 depth = 1
-patch_directory = nitrogfx_patch
+
+[provide]
+program_names = nitrogfx
diff --git a/subprojects/packagefiles/nitrogfx_patch/meson.build b/subprojects/packagefiles/nitrogfx_patch/meson.build
deleted file mode 100644
index a2051b6d79..0000000000
--- a/subprojects/packagefiles/nitrogfx_patch/meson.build
+++ /dev/null
@@ -1,21 +0,0 @@
-project('nitrogfx', 'c')
-
-libpng_dep = dependency('libpng', native: true)
-
-nitrogfx_exe = executable('nitrogfx',
-    sources: [
-        'main.c',
-        'convert_png.c',
-        'gfx.c',
-        'jasc_pal.c',
-        'lz.c',
-        'rl.c',
-        'util.c',
-        'font.c',
-        'huff.c',
-        'json.c',
-        'cJSON.c',
-    ],
-    dependencies: libpng_dep,
-    native: true
-)
diff --git a/tools/meson.build b/tools/meson.build
index e79bee6b13..94622d9ab2 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -11,4 +11,4 @@ makelcf_exe = find_program('makelcf', native: true)
 makerom_exe = find_program('makerom', native: true)
 
 # External tools
-nitrogfx_exe = subproject('nitrogfx').get_variable('nitrogfx_exe')
+nitrogfx_exe = find_program('nitrogfx', native: true)