diff --git a/lib/wptoml/array.cpp b/lib/wptoml/array.cpp
index a907d262525985ca835ec389aaad331fc55219d2..92b5180300652163d22a90c07b173e0eec4088da 100644
--- a/lib/wptoml/array.cpp
+++ b/lib/wptoml/array.cpp
@@ -10,7 +10,7 @@
 #include <functional>
 
 /* CPPTOML */
-#include <include/cpptoml.h>
+#include <cpptoml.h>
 
 /* TOML */
 #include "private.h"
diff --git a/lib/wptoml/file.cpp b/lib/wptoml/file.cpp
index d39e468ba053b2620484663c49861a41bb9ca6b5..4b53e03650286a8d96aef497df11059c1617e3b4 100644
--- a/lib/wptoml/file.cpp
+++ b/lib/wptoml/file.cpp
@@ -7,7 +7,7 @@
  */
 
 /* CPPTOML */
-#include <include/cpptoml.h>
+#include <cpptoml.h>
 
 /* TOML */
 #include "private.h"
diff --git a/lib/wptoml/table.cpp b/lib/wptoml/table.cpp
index 3224826bd9084c8269baf422c881fa26e5415a0e..40368f5848f82b602ffba6bbc1d6a073603d6faf 100644
--- a/lib/wptoml/table.cpp
+++ b/lib/wptoml/table.cpp
@@ -10,7 +10,7 @@
 #include <functional>
 
 /* CPPTOML */
-#include <include/cpptoml.h>
+#include <cpptoml.h>
 
 /* TOML */
 #include "private.h"
diff --git a/meson.build b/meson.build
index 650daa7c85a1df1fc63a589ac6824e5124030a85..9f71356f4ae50ef0e0a3235867b0e53273e1a6f3 100644
--- a/meson.build
+++ b/meson.build
@@ -26,9 +26,13 @@ else
   wireplumber_config_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'wireplumber')
 endif
 
-cmake = import('cmake')
-cpptoml = cmake.subproject('cpptoml')
-cpptoml_dep = cpptoml.dependency('cpptoml')
+if get_option('wrap_mode') == 'nodownload'
+  cpptoml_dep = dependency('cpptoml')
+else
+  cmake = import('cmake')
+  cpptoml = cmake.subproject('cpptoml')
+  cpptoml_dep = cpptoml.dependency('cpptoml')
+endif
 
 gobject_dep = dependency('gobject-2.0', version : '>= 2.58')
 gmodule_dep = dependency('gmodule-2.0', version : '== ' + gobject_dep.version())
diff --git a/subprojects/cpptoml.wrap b/subprojects/cpptoml.wrap
index 7fa60bd9b5926e4bbb1b37c2ac8abcb787b2ecd8..a342dcbd93aea33fb013a850d71656725d5105ea 100644
--- a/subprojects/cpptoml.wrap
+++ b/subprojects/cpptoml.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory=cpptoml
 url=https://github.com/skystrife/cpptoml.git
-revision=master
+revision=v0.1.1