diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e454816e..22eaea06f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 cmake_minimum_required(VERSION 3.5.1)
 
-project(libgit2 VERSION "1.8.4" LANGUAGES C)
+project(libgit2 VERSION "1.8.5" LANGUAGES C)
 
 # Add find modules to the path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
diff --git a/docs/changelog.md b/docs/changelog.md
index 02bad65e1..d4cbb395b 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,3 +1,17 @@
+v1.8.5
+------
+
+This is a security release with multiple changes.
+
+* A bug in the external SSH execution is fixed that could cause
+  arbitrary command execution. Remote repository names were improperly
+  sent to the shell without quoting. Arguments to the external SSH
+  command are now sent parameterized.
+
+* A bug in SSH credential creation is fixed that could cause a
+  buffer overflow. Public keys that are not NUL terminated were
+  improperly zeroed. The given length of public keys is now honored.
+
 v1.8.4
 ------
 
diff --git a/include/git2/version.h b/include/git2/version.h
index 65fd199cf..540bf2866 100644
--- a/include/git2/version.h
+++ b/include/git2/version.h
@@ -11,7 +11,7 @@
  * The version string for libgit2.  This string follows semantic
  * versioning (v2) guidelines.
  */
-#define LIBGIT2_VERSION        "1.8.4"
+#define LIBGIT2_VERSION        "1.8.5"
 
 /** The major version number for this version of libgit2. */
 #define LIBGIT2_VER_MAJOR      1
@@ -20,7 +20,7 @@
 #define LIBGIT2_VER_MINOR      8
 
 /** The revision ("teeny") version number for this version of libgit2. */
-#define LIBGIT2_VER_REVISION   4
+#define LIBGIT2_VER_REVISION   5
 
 /** The Windows DLL patch number for this version of libgit2. */
 #define LIBGIT2_VER_PATCH      0
diff --git a/package.json b/package.json
index 6b8106c43..0e6e66efc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libgit2",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "repo": "https://github.com/libgit2/libgit2",
   "description": " A cross-platform, linkable library implementation of Git that you can use in your application.",
   "install": "mkdir build && cd build && cmake .. && cmake --build ."