diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index ab59aa1b7f3..25784aa66e5 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -952,13 +952,6 @@ TODO: document the other workarounds.
         </application>
     </device>
 
-    <device driver="r600">
-        <application name="Tomb Raider 2013" executable="TombRaider">
-            <option name="mesa_extension_override" value="-GL_ARB_shader_image_load_store" />
-        </application>
-    </device>
-
-
     <!--
          The android game hall of shame:
 
diff --git a/src/util/00-r600-defaults.conf b/src/util/00-r600-defaults.conf
new file mode 100644
index 00000000000..7e6dae4c0d0
--- /dev/null
+++ b/src/util/00-r600-defaults.conf
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<driconf>
+    <device driver="r600">
+        <application name="Tomb Raider 2013" executable="TombRaider">
+            <option name="mesa_extension_override" value="-GL_ARB_shader_image_load_store" />
+        </application>
+    </device>
+</driconf>
diff --git a/src/util/meson.build b/src/util/meson.build
index c01e16be3a2..47170eaf229 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -273,6 +273,10 @@ if with_gallium_zink
   files_drirc += files('00-zink-defaults.conf')
 endif
 
+if with_gallium_r600
+  files_drirc += files('00-r600-defaults.conf')
+endif
+
 drirc_gen = files('drirc_gen.py')
 
 if with_tests