diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index bd899222caa..fa2fe846de2 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0"?>
 <!--
 
 ============================================
@@ -28,31 +28,6 @@ TODO: document the other workarounds.
 
 -->
 
-<!DOCTYPE driconf [
-   <!ELEMENT driconf      (device+)>
-   <!ELEMENT device       (application | engine)+>
-   <!ATTLIST device       driver CDATA #IMPLIED
-                          device CDATA #IMPLIED>
-   <!ELEMENT application  (option+)>
-   <!ATTLIST application  name CDATA #REQUIRED
-                          executable CDATA #IMPLIED
-                          executable_regexp CDATA #IMPLIED
-                          sha1 CDATA #IMPLIED
-                          application_name_match CDATA #IMPLIED
-                          application_versions CDATA #IMPLIED>
-   <!ELEMENT engine       (option+)>
-
-   <!-- engine_name_match: A regexp matching the engine name -->
-   <!-- engine_versions: A version in range format
-             (version 1 to 4 : "1:4") -->
-
-   <!ATTLIST engine       engine_name_match CDATA #REQUIRED
-                          engine_versions CDATA #IMPLIED>
-
-   <!ELEMENT option       EMPTY>
-   <!ATTLIST option       name CDATA #REQUIRED
-                          value CDATA #REQUIRED>
-]>
 
 <driconf>
     <!-- Please always enable app-specific workarounds for all drivers and
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index 0b38f65874c..aa682f83b3b 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="yes"?>
+<?xml version="1.0"?>
 <!--
 
 ============================================
@@ -7,31 +7,6 @@ Application bugs worked around in this file:
 
 -->
 
-<!DOCTYPE driconf [
-   <!ELEMENT driconf      (device+)>
-   <!ELEMENT device       (application | engine)+>
-   <!ATTLIST device       driver CDATA #IMPLIED
-                          device CDATA #IMPLIED>
-   <!ELEMENT application  (option+)>
-   <!ATTLIST application  name CDATA #REQUIRED
-                          executable CDATA #IMPLIED
-                          executable_regexp CDATA #IMPLIED
-                          sha1 CDATA #IMPLIED
-                          application_name_match CDATA #IMPLIED
-                          application_versions CDATA #IMPLIED>
-   <!ELEMENT engine       (option+)>
-
-   <!-- engine_name_match: A regexp matching the engine name -->
-   <!-- engine_versions: A version in range format
-             (version 1 to 4 : "1:4") -->
-
-   <!ATTLIST engine       engine_name_match CDATA #REQUIRED
-                          engine_versions CDATA #IMPLIED>
-
-   <!ELEMENT option       EMPTY>
-   <!ATTLIST option       name CDATA #REQUIRED
-                          value CDATA #REQUIRED>
-]>
 
 <!-- NOTE: `executable` shouldn't be used for shader based drirc workarounds
      because they aren't applied when replaying with Fossilize for precompilation. -->
diff --git a/src/util/driconf.dtd b/src/util/driconf.dtd
new file mode 100644
index 00000000000..98495cf6842
--- /dev/null
+++ b/src/util/driconf.dtd
@@ -0,0 +1,23 @@
+<!ELEMENT driconf      (device+)>
+<!ELEMENT device       (application | engine)+>
+<!ATTLIST device       driver CDATA #IMPLIED
+                       device CDATA #IMPLIED>
+<!ELEMENT application  (option+)>
+<!ATTLIST application  name CDATA #REQUIRED
+                       executable CDATA #IMPLIED
+                       executable_regexp CDATA #IMPLIED
+                       sha1 CDATA #IMPLIED
+                       application_name_match CDATA #IMPLIED
+                       application_versions CDATA #IMPLIED>
+<!ELEMENT engine       (option+)>
+
+<!-- engine_name_match: A regexp matching the engine name -->
+<!-- engine_versions: A version in range format
+          (version 1 to 4 : "1:4") -->
+
+<!ATTLIST engine       engine_name_match CDATA #REQUIRED
+                       engine_versions CDATA #IMPLIED>
+
+<!ELEMENT option       EMPTY>
+<!ATTLIST option       name CDATA #REQUIRED
+                       value CDATA #REQUIRED>
diff --git a/src/util/meson.build b/src/util/meson.build
index 99a5860bd6e..1e62d3c105c 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -225,7 +225,7 @@ if with_tests
     test(
       'drirc xml validation',
       prog_xmllint,
-      args : ['--noout', '--valid', files_drirc],
+      args : ['--noout', '--dtdvalid', files('driconf.dtd'), files_drirc],
       suite : ['util'],
     )
   endif