diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a3a479cd..0aa4f874b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,8 @@ autotools-build-and-test:
         - ../autogen.sh --prefix=/usr
         - make -j$(nproc) distcheck
         - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j$(nproc) check
+        - cd ..
+        - .gitlab-ci/manpages-check
 
 meson-build-and-test:
     extends: .common-build-and-test
@@ -83,3 +85,4 @@ meson-build-and-test:
         - meson -Dprefix=/usr -Dxephyr=true build/
         - ninja -C build/ install
         - ninja -C build/ test
+        - .gitlab-ci/manpages-check
diff --git a/.gitlab-ci/manpages-check b/.gitlab-ci/manpages-check
new file mode 100755
index 000000000..cf2b15349
--- /dev/null
+++ b/.gitlab-ci/manpages-check
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+find build/ -regex ".*\.[1-9]$" -exec grep -E \
+@vendorversion@\|\
+@xorgversion@\|\
+@xservername@\|\
+@xconfigfile@\|\
+@projectroot@\|\
+@apploaddir@\|\
+@appmansuffix@\|\
+@drivermansuffix@\|\
+@adminmansuffix@\|\
+@libmansuffix@\|\
+@miscmansuffix@\|\
+@filemansuffix@\|\
+@logdir@\|\
+@datadir@\|\
+@mandir@\|\
+@sysconfdir@\|\
+@xconfigdir@\|\
+@xkbdir@\|\
+@XKB_DFLT_RULES@\|\
+@XKB_DFLT_MODEL@\|\
+@XKB_DFLT_LAYOUT@\|\
+@XKB_DFLT_VARIANT@\|\
+@XKB_DFLT_OPTIONS@\|\
+@bundle_id_prefix@\|\
+@modulepath@\|\
+@suid_wrapper_dir@\|\
+@default_font_path@\
+ '{}' + && { echo "Missing manpage substitutions detected!" >&2 ; exit 1; }
+
+exit 0