diff --git a/CHANGES.md b/CHANGES.md
index c67d1690..27b002e8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## 11.5.0 2021-06-23
+
+### Other changes
+* Implement GLSL_EXT_shader_atomic_float2
+* Implement GL_EXT_spirv_intrinsics
+* Fixed SPIR-V remapper not remapping OpExtInst instruction set IDs
+* only declare compatibility gl_ variables in compatibility mode
+* Add support for float spec const vector initialization
+* Implement GL_EXT_subgroup_uniform_control_flow.
+* Fix arrays dimensioned with spec constant sized gl_WorkGroupSize
+* Add support for 64bit integer scalar and vector types to bitCount() builtin
+
 ## 11.4.0 2021-04-22
 
 ### Other changes
diff --git a/known_good.json b/known_good.json
index 177fab1d..c6fd4ff4 100644
--- a/known_good.json
+++ b/known_good.json
@@ -5,14 +5,14 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "4d22f58a812ea02e1ad53c9ccba12cb48f2bd0b2"
+      "commit" : "5dd2f76918bb2d0d67628e338f60f724f3e02e13"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "f5417a4b6633c3217c9a1bc2f0c70b1454975ba7"
+      "commit" : "07f259e68af3a540038fa32df522554e74f53ed5"
     }
   ]
 }