diff --git a/config.sh b/config.sh
index 249a7150fd..d8b4fa41d7 100755
--- a/config.sh
+++ b/config.sh
@@ -69,4 +69,4 @@ elif is_wsl_accessing_windows; then
 fi
 
 # Launch meson
-"${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"
+"${MESON:-meson}" setup --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 b4e897d103..2118370632 100644
--- a/subprojects/nitrogfx.wrap
+++ b/subprojects/nitrogfx.wrap
@@ -2,6 +2,3 @@
 url = https://github.com/red031000/nitrogfx.git
 revision = head
 depth = 1
-
-[provide]
-program_names = nitrogfx
diff --git a/tools/meson.build b/tools/meson.build
index 94622d9ab2..9d0f782f30 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -11,4 +11,8 @@ makelcf_exe = find_program('makelcf', native: true)
 makerom_exe = find_program('makerom', native: true)
 
 # External tools
-nitrogfx_exe = find_program('nitrogfx', native: true)
+nitrogfx_exe = find_program('nitrogfx', native: true, required: false)
+if not nitrogfx_exe.found()
+    subproject('nitrogfx', default_options: 'native=true')
+    nitrogfx_exe = find_program('nitrogfx', native: true)
+endif