diff --git a/DEPS b/DEPS
index a0b7167..d617d1a 100644
--- a/DEPS
+++ b/DEPS
@@ -121,7 +121,7 @@
   },
 
   'third_party/swiftshader': {
-    'url': '{swiftshader_git}/SwiftShader@562df4889b8140479d1429e67391f80025493e94',
+    'url': '{swiftshader_git}/SwiftShader@f354daff5a2b882fc182c8377c826aa99b30f989',
     'condition': 'dawn_standalone',
   },
 
diff --git a/build_overrides/swiftshader.gni b/build_overrides/swiftshader.gni
index 1674d48..c1442c1 100644
--- a/build_overrides/swiftshader.gni
+++ b/build_overrides/swiftshader.gni
@@ -20,3 +20,7 @@
 
 # Paths to SwiftShader dependencies in Dawn
 swiftshader_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+
+# Forward to ozone_platform_x11 when inside Dawn's repository
+import("../scripts/dawn_features.gni")
+ozone_platform_x11 = dawn_use_x11
diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni
index 9c09139..9463e66 100644
--- a/build_overrides/vulkan_validation_layers.gni
+++ b/build_overrides/vulkan_validation_layers.gni
@@ -20,6 +20,6 @@
 vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
 vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src"
 
-# Fake the ozone_platform_x11 when inside Dawn's repository
+# Forward to ozone_platform_x11 when inside Dawn's repository
 import("../scripts/dawn_features.gni")
 ozone_platform_x11 = dawn_use_x11