diff --git a/meson.build b/meson.build
index dea5ea8..5264985 100644
--- a/meson.build
+++ b/meson.build
@@ -33,18 +33,10 @@
 if get_option('fru-device')
     i2c = cpp.find_library('i2c')
 endif
-if cpp.has_header('nlohmann/json.hpp')
-    nlohmann_json = declare_dependency()
-else
-    subproject('nlohmann', required: false)
-    nlohmann_json = declare_dependency(
-        include_directories: [
-            'subprojects/nlohmann/single_include',
-            'subprojects/nlohmann/single_include/nlohmann',
-        ]
-    )
-    nlohmann_json = nlohmann_json.as_system('system')
-endif
+
+nlohmann_json_dep = dependency('nlohmann_json',
+                               fallback: [ 'nlohmann_json', 'nlohmann_json_dep'])
+
 sdbusplus = dependency('sdbusplus', required: false)
 if not sdbusplus.found()
     sdbusplus_proj = subproject('sdbusplus', required: true)
@@ -217,7 +209,7 @@
             dependencies: [
                 boost,
                 gtest,
-                nlohmann_json,
+                nlohmann_json_dep,
                 sdbusplus,
                 valijson,
             ],
diff --git a/src/meson.build b/src/meson.build
index 939574e..411f0d4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,7 +12,7 @@
     cpp_args: cpp_args + ['-DBOOST_ASIO_DISABLE_THREADS'],
     dependencies: [
         boost,
-        nlohmann_json,
+        nlohmann_json_dep,
         sdbusplus,
         valijson,
     ],
@@ -36,7 +36,7 @@
         dependencies: [
             boost,
             i2c,
-            nlohmann_json,
+            nlohmann_json_dep,
             sdbusplus,
             threads,
             valijson,
diff --git a/subprojects/nlohmann.wrap b/subprojects/nlohmann_json.wrap
similarity index 100%
rename from subprojects/nlohmann.wrap
rename to subprojects/nlohmann_json.wrap