diff --git a/ChangeLog b/ChangeLog
index 19cd3e64c3..099b655b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Version 3.6.0
+-------------
+
+    * add a `src_dir` argument to java_library
+    * allow attaching deps to a remote_file
+    * fix `plz clean` background bug
+    * #107 Introduce https and mutual auth support to RPC cache
+    * #108 New query subcommand, `plz query whatoutputs`, which queries the current graph and returns the
+      target responsible for the provided file(s)
+
+
 Version 3.5.0
 -------------
 
diff --git a/VERSION b/VERSION
index 1545d96657..40c341bdcd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.0
+3.6.0