diff --git a/.pick_status.json b/.pick_status.json
index d7ea159347b..f7a48576670 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -24,7 +24,7 @@
         "description": "docs/ci: treat warnings as errors",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "fdd204538b93e17cecd32786603e0e2452e459c4",
         "notes": null
diff --git a/docs/gitlab-ci.yml b/docs/gitlab-ci.yml
index e052b893f48..54910af6ccb 100644
--- a/docs/gitlab-ci.yml
+++ b/docs/gitlab-ci.yml
@@ -10,6 +10,7 @@
     - meson setup _build -D prefix=$(pwd) --auto-features=disabled
       -D vulkan-drivers="" -D gallium-drivers="" -D platforms=[] -D glx=disabled
       -D video-codecs="" -D html-docs=enabled -D html-docs-path=public
+      -D werror=true
     - meson compile -C _build
     - meson install -C _build
 
diff --git a/docs/meson.build b/docs/meson.build
index eb33509503d..dc8fd6979fa 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -11,12 +11,18 @@ assert Version(hawkmoth.__version__) >= Version("0.16.0")
   error_message: 'hawkmoth >= 0.16.0 required'
 )
 
+sphinx_args = []
+if get_option('werror')
+  sphinx_args += '-W'
+endif
+
 html_docs = custom_target(
   'html',
   depfile: 'docs.d',
   depend_files: files('conf.py'),
   command: [sphinx, '-b', 'html', '-q',
             '-Ddepfile=@DEPFILE@',
+            sphinx_args,
             meson.current_source_dir(), '@OUTPUT@'],
   output: 'html',
   build_by_default: get_option('html-docs').enabled(),