diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6b9970b..7e26dce1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,13 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Packaging notes
 
+- All Meson wraps now use `wrap-git` instead of downloading tarballs from
+  GitHub. Previously the bitsery and function2 wraps would use source tarballs.
+- The patch overlays for the bitsery and function2 wraps are now in regular
+  directories instead of being in tarballs committed to yabridge's repository.
+  This means that building now requires **Meson 0.55** or later because of the
+  use of `patch_directory`.
+- The bitsery wrap dependency was updated to version 5.2.2.
 - The function2 wrap dependency was updated to version 4.2.0.
 
 ## [3.6.0] - 2021-10-15
diff --git a/meson.build b/meson.build
index dce11e96..ea95315b 100644
--- a/meson.build
+++ b/meson.build
@@ -225,8 +225,6 @@ endif
 # and 64-bit versions
 
 boost_dep = dependency('boost', version : '>=1.66', static : with_static_boost)
-# TODO: Meson doesn't have a way to define version ranges, does it? Like
-#       `^>=5.2.0`, `>=5.2.0 && <6.0.0` or `5.2.*`.
 bitsery_dep = dependency('bitsery', version : '>=5.2.0', fallback : ['bitsery', 'bitsery_dep'])
 function2_dep = dependency('function2', version : '>=4.2.0', fallback : ['function2', 'function2_dep'])
 threads_dep = dependency('threads')
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index a5996a79..27f44036 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -5,4 +5,5 @@
 /vst3
 
 # And we obviously don't want to ignore our overlays
+!/bitsery-patch/*
 !/function2-patch/*
diff --git a/subprojects/bitsery-patch-5.2.0.tar.xz b/subprojects/bitsery-patch-5.2.0.tar.xz
deleted file mode 100644
index 3767ea13..00000000
Binary files a/subprojects/bitsery-patch-5.2.0.tar.xz and /dev/null differ
diff --git a/subprojects/bitsery-patch/meson.build b/subprojects/bitsery-patch/meson.build
new file mode 100644
index 00000000..31eb696c
--- /dev/null
+++ b/subprojects/bitsery-patch/meson.build
@@ -0,0 +1,3 @@
+project('bitsery', 'cpp', version : '5.2.0')
+
+bitsery_dep = declare_dependency(include_directories : include_directories('include'))
diff --git a/subprojects/bitsery.wrap b/subprojects/bitsery.wrap
index 8675a56b..e4c86048 100644
--- a/subprojects/bitsery.wrap
+++ b/subprojects/bitsery.wrap
@@ -1,11 +1,7 @@
-[wrap-file]
-directory = bitsery-5.2.0
+[wrap-git]
+url = https://github.com/fraillt/bitsery.git
+# This is tag v5.2.2
+revision = c0fc083c9de805e5825d7553507569febf6a6f93
+depth = 1
 
-source_url = https://github.com/fraillt/bitsery/archive/v5.2.0.tar.gz
-source_filename = bitsery-v5.2.0.tar.gz
-source_hash = 99f47bca227abb6b9e8030703dcc402ab930ff3bf0a87c89c3f0fb9536cad448
-
-# TODO: Meson 0.55 added patch_directory, so we can just use that instead
-patch_url = file:./subprojects/bitsery-patch-5.2.0.tar.xz
-patch_filename = bitsery-patch-5.2.0.tar.xz
-patch_hash = ab12b1622de7a17e2996ab86a0947bbbc39e6684d9ad06c46f8e3877e5f8683d
+patch_directory = subprojects/bitsery-patch