diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 198a9c3..2c81c8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ include:
 # $ git push -f -o ci.variable="FDO_FORCE_REBUILD=1"
 variables:
   FDO_UPSTREAM_REPO: 'emersion/libdisplay-info'
-  FDO_DISTRIBUTION_TAG: '2024-06-06.0'
+  FDO_DISTRIBUTION_TAG: '2024-06-07.0'
 
 workflow:
   rules:
@@ -39,13 +39,16 @@ prepare-container:
   extends: .fdo.container-build@alpine@x86_64
   stage: "Prepare container"
   variables:
+    EDID_DECODE_COMMIT: c6b859d7f0251e2433fb81bd3f67bd2011c2036c
     FDO_BASE_IMAGE: alpine:latest
     FDO_DISTRIBUTION_PACKAGES: |
       build-base clang compiler-rt meson make git gcovr py3-pygments go hwdata
     FDO_DISTRIBUTION_EXEC: |
+      grep $EDID_DECODE_COMMIT ./subprojects/edid-decode.wrap >/dev/null || \
+        (echo "Keep edid-decode.wrap and CI in sync!" && exit 1)
       git clone git://linuxtv.org/edid-decode.git
       cd edid-decode
-      git checkout a645579430980c89af961b68193461329bd3eb4d
+      git checkout $EDID_DECODE_COMMIT
       meson setup build/
       ninja -C build/
       ninja -C build/ install
diff --git a/meson.build b/meson.build
index 3fb157c..b7fc820 100644
--- a/meson.build
+++ b/meson.build
@@ -7,6 +7,7 @@ project(
 	default_options: [
 		'c_std=c11',
 		'warning_level=3',
+		'wrap_mode=nodownload',
 	],
 )
 
diff --git a/subprojects/edid-decode.wrap b/subprojects/edid-decode.wrap
new file mode 100644
index 0000000..4ba5132
--- /dev/null
+++ b/subprojects/edid-decode.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://git.linuxtv.org/edid-decode.git
+revision = c6b859d7f0251e2433fb81bd3f67bd2011c2036c
diff --git a/test/meson.build b/test/meson.build
index 0e4d289..a1e7914 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -64,6 +64,7 @@ foreach tc : test_cases
 	gen_targets += files('data/' + tc + '.edid')
 endforeach
 
+subproject('edid-decode', required: false)
 ref_edid_decode = find_program('edid-decode', native: true, required: false)
 if ref_edid_decode.found()
 	test_env += 'REF_EDID_DECODE=' + ref_edid_decode.full_path()