diff --git a/meson.build b/meson.build
index 9b224670f..9d93f1579 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,8 @@ project(
     'expat:default_library=static',
     'fmt:default_library=static',
     'gtest:default_library=static',
+    'libmicrohttpd:default_library=static',
+    'libnpupnp:default_library=static',
     'sqlite3:default_library=static',
     'vorbis:default_library=static',
 
@@ -23,6 +25,8 @@ project(
     'expat:warning_level=0',
     'fmt:warning_level=0',
     'gtest:warning_level=0',
+    'libmicrohttpd:warning_level=0',
+    'libnpupnp:warning_level=0',
     'sqlite3:warning_level=0',
     'vorbis:warning_level=0',
   ],
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index 4eb01d547..c8ab8e2f2 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -4,4 +4,6 @@
 /fmt-*/
 /googletest-*/
 /sqlite-*/
+/libmicrohttpd*
+/libnpupnp-*/
 /libvorbis-*/
diff --git a/subprojects/libnpupnp.wrap b/subprojects/libnpupnp.wrap
new file mode 100644
index 000000000..035fe3409
--- /dev/null
+++ b/subprojects/libnpupnp.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = libnpupnp-6.2.0
+source_url = https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-6.2.0.tar.gz
+source_filename = libnpupnp-6.2.0.tar.gz
+source_hash = 1c8101607f32a61f2477f23fa33839aa6d64568a83ca23ba43d430290937251d
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libnpupnp_6.2.0-1/libnpupnp-6.2.0.tar.gz
+wrapdb_version = 6.2.0-1
+
+[provide]
+libnpupnp = libnpupnp_dep