diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 5798cebbbdf..e7c280231f4 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -797,18 +797,6 @@ TODO: document the other workarounds.
             <option name="wgl_require_gdi_compat" value="true" />
         </application>
     </device>
-    <!-- vmwgfx doesn't like full buffer swaps and can't sync to vertical retraces.-->
-    <device driver="vmwgfx">
-        <application name="gnome-shell" executable="gnome-shell">
-            <option name="glx_extension_override" value="-GLX_OML_sync_control -GLX_SGI_video_sync" />
-        </application>
-        <application name="cinnamon" executable="cinnamon">
-            <option name="glx_extension_override" value="-GLX_OML_sync_control -GLX_SGI_video_sync" />
-        </application>
-        <application name="Compiz" executable="Compiz">
-            <option name="glx_extension_override" value="-GLX_OML_sync_control" />
-        </application>
-    </device>
     <device driver="hasvk">
         <application name="Aperture Desk Job" executable="deskjob">
             <option name="anv_assume_full_subgroups" value="32" />
diff --git a/src/util/00-vmwgfx-defaults.conf b/src/util/00-vmwgfx-defaults.conf
new file mode 100644
index 00000000000..d2f893c0865
--- /dev/null
+++ b/src/util/00-vmwgfx-defaults.conf
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<driconf>
+    <!-- vmwgfx doesn't like full buffer swaps and can't sync to vertical retraces.-->
+    <device driver="vmwgfx">
+        <application name="gnome-shell" executable="gnome-shell">
+            <option name="glx_extension_override" value="-GLX_OML_sync_control -GLX_SGI_video_sync" />
+        </application>
+        <application name="cinnamon" executable="cinnamon">
+            <option name="glx_extension_override" value="-GLX_OML_sync_control -GLX_SGI_video_sync" />
+        </application>
+        <application name="Compiz" executable="Compiz">
+            <option name="glx_extension_override" value="-GLX_OML_sync_control" />
+        </application>
+    </device>
+</driconf>
diff --git a/src/util/meson.build b/src/util/meson.build
index d2a78ffb86f..c0563aad18d 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -285,6 +285,10 @@ if with_gallium_d3d12
   files_drirc += files('00-d3d12-defaults.conf')
 endif
 
+if with_gallium_svga
+  files_drirc += files('00-vmwgfx-defaults.conf')
+endif
+
 drirc_gen = files('drirc_gen.py')
 
 if with_tests