diff --git a/.gitmodules b/.gitmodules
index 58feb9936..0790831e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,8 @@
 	url = https://github.com/premake/premake-core.git
 [submodule "third_party/snappy"]
 	path = third_party/snappy
-	url = https://github.com/xenia-project/snappy.git
+	url = https://github.com/google/snappy.git
+	ignore = dirty
 [submodule "third_party/premake-export-compile-commands"]
 	path = third_party/premake-export-compile-commands
 	url = https://github.com/xenia-project/premake-export-compile-commands.git
diff --git a/docs/building.md b/docs/building.md
index 843787d6d..061bb9f32 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -10,9 +10,10 @@ drivers.
 
 * Windows 10 or later
 * [Visual Studio 2022](https://www.visualstudio.com/downloads/)
+* CMake 3.10+ (or C++ CMake tools for Windows)
+* Windows 11 SDK version 10.0.22000.0 (for Visual Studio 2022, this or any newer version)
 * [Python 3.9+](https://www.python.org/downloads/)
   * Ensure Python is in PATH.
-* Windows 11 SDK version 10.0.22000.0 (for Visual Studio 2022, this or any newer version)
 
 ```
 git clone https://github.com/xenia-canary/xenia-canary.git
diff --git a/third_party/snappy b/third_party/snappy
index 303cd2c64..6af9287fb 160000
--- a/third_party/snappy
+++ b/third_party/snappy
@@ -1 +1 @@
-Subproject commit 303cd2c64c62c579a8592236f723b611afd3bc15
+Subproject commit 6af9287fbdb913f0794d0148c6aa43b58e63c8e3
diff --git a/third_party/snappy.lua b/third_party/snappy.lua
index bf13b762e..36a7a18c3 100644
--- a/third_party/snappy.lua
+++ b/third_party/snappy.lua
@@ -18,5 +18,9 @@ project("snappy")
     "snappy/snappy.h",
   })
 
-  filter("platforms:Windows")
-    warnings("Off")  -- Too many warnings.
+  local snappy_dir = path.getabsolute("snappy")
+  if not os.isfile(path.join(snappy_dir, "snappy-stubs-public.h")) then
+    prebuildcommands({
+      "cmake -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF -DSNAPPY_REQUIRE_AVX=ON "..snappy_dir.." -B"..snappy_dir
+    })
+  end