diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2791646a04..fa2cba4a5f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 Changelog
 =========
+Version 0.9.5
+-------------
+* JDK17 support improvements:
+  - Fix crash with switch expression as a lambda body (#543, follow up: #545)
+  - Better fix for crash on member selects inside module-info.java (#544)
+* Bump Guava dependency to 24.1.1 (#536)
+* Build / CI tooling for NullAway itself:
+  - Bump AutoValue and AutoService versions (#538)
+  - Add task to run NullAway on itself (#542)
+  - Add test case for unsound map reassignment handling (#541)
+
 Version 0.9.4
 -------------
 * Fix crash with fully-qualified names in module-info.java import (#534)
diff --git a/README.md b/README.md
index d4556f7079..69e22a6014 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ plugins {
 }
 
 dependencies {
-  annotationProcessor "com.uber.nullaway:nullaway:0.9.4"
+  annotationProcessor "com.uber.nullaway:nullaway:0.9.5"
 
   // Optional, some source of nullability annotations.
   // Not required on Android if you use the support 
@@ -75,7 +75,7 @@ The configuration for an Android project is very similar to the Java case, with
 
 ```gradle
 dependencies {
-  annotationProcessor "com.uber.nullaway:nullaway:0.9.4"
+  annotationProcessor "com.uber.nullaway:nullaway:0.9.5"
   errorprone "com.google.errorprone:error_prone_core:2.4.0"
   errorproneJavac "com.google.errorprone:javac:9+181-r4173-1"  
 }
diff --git a/gradle.properties b/gradle.properties
index a10362f734..514579eca1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@
 # org.gradle.parallel=true
 
 GROUP=com.uber.nullaway
-VERSION_NAME=0.9.5-SNAPSHOT
+VERSION_NAME=0.9.5
 
 POM_DESCRIPTION=A fast annotation-based null checker for Java