diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 233e7336..21bfd8e3 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -36,7 +36,7 @@ jobs:
       matrix_config: >
         {
           "gcc": [
-            { "versions": ["trunk"],
+            { "versions": ["trunk-enolantest"],
               "tests": [
                 { "cxxversions": ["c++26"],
                   "tests": [
diff --git a/lockfile.json b/lockfile.json
index fc6ec102..7d195e37 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -5,6 +5,12 @@
       "package_name": "beman.transform_view",
       "git_repository": "https://github.com/bemanproject/transform_view.git",
       "git_tag": "225fd3d2987548c10c2cfabd279119b1e68950e2"
+    },
+    {
+      "name": "wg21",
+      "package_name": "MparkWg21",
+      "git_repository": "https://github.com/ednolan/wg21.git",
+      "git_tag": "5f9f51817fc3500c1e11b7c4fcdb22f61cbbeff1"
     }
   ]
 }
diff --git a/papers/CMakeLists.txt b/papers/CMakeLists.txt
index 4e23d99c..0c589919 100644
--- a/papers/CMakeLists.txt
+++ b/papers/CMakeLists.txt
@@ -5,48 +5,8 @@
 #    (See accompanying file LICENSE.txt or copy at
 #          https://www.boost.org/LICENSE_1_0.txt)
 
-include(FetchContent)
+find_package(MparkWg21 REQUIRED)
 
-FetchContent_Declare(
-    wg21
-    GIT_REPOSITORY https://github.com/mpark/wg21.git
-    GIT_TAG 49c655869c14d80645962b6fceb503249f69bc9e
-    EXCLUDE_FROM_ALL
-)
-FetchContent_MakeAvailable(wg21)
-
-add_custom_command(
-    OUTPUT P2728.html
-    COMMAND
-        ${CMAKE_COMMAND} -E env SRCDIR=${CMAKE_CURRENT_SOURCE_DIR}
-        OUTDIR=${CMAKE_CURRENT_BINARY_DIR} make -f ${wg21_SOURCE_DIR}/Makefile
-        html
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/P2728.md
-    VERBATIM
-)
-add_custom_target(p2728 ALL DEPENDS P2728.html)
-
-add_custom_command(
-    OUTPUT P3705.html
-    COMMAND
-        ${CMAKE_COMMAND} -E env SRCDIR=${CMAKE_CURRENT_SOURCE_DIR}
-        OUTDIR=${CMAKE_CURRENT_BINARY_DIR} make -f ${wg21_SOURCE_DIR}/Makefile
-        html
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/P3705.md
-    VERBATIM
-)
-add_custom_target(p3705 ALL DEPENDS P3705.html p2728)
-
-add_custom_command(
-    OUTPUT P4030.html
-    COMMAND
-        ${CMAKE_COMMAND} -E env SRCDIR=${CMAKE_CURRENT_SOURCE_DIR}
-        OUTDIR=${CMAKE_CURRENT_BINARY_DIR} make -f ${wg21_SOURCE_DIR}/Makefile
-        html
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/P4030.md
-    VERBATIM
-)
-add_custom_target(p4030 ALL DEPENDS P4030.html p3705)
+wg21_add_paper(P2728 ALL)
+wg21_add_paper(P3705 ALL)
+wg21_add_paper(P4030 ALL)