diff --git a/ChangeLog b/ChangeLog
index f3bcd987..fc5be8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-????-??-?? -- ?????
+2018-08-18 -- 0.8.6
 
   * Fixed: Bad/NULL .hostText.afterLast when parsing certain rather pathologic
       but well-formed URIs with empty host (e.g. "//:%aa@") (GitHub #15)
diff --git a/configure.ac b/configure.ac
index 53854702..2effbe96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.61)
-AC_INIT([uriparser], [0.8.5])
+AC_INIT([uriparser], [0.8.6])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.10.1 foreign dist-zip dist-bzip2 no-dist-gzip subdir-objects])
 
diff --git a/include/uriparser/Uri.h b/include/uriparser/Uri.h
index 46ffd5f4..f4600fbd 100644
--- a/include/uriparser/Uri.h
+++ b/include/uriparser/Uri.h
@@ -1,4 +1,4 @@
-/* f9ca23a99fc1c8ff610e2bdc0bff3c4bb4d883ccbff5851fe7a1398f9b6aca57 (0.8.5+)
+/* 5afca6d8abb5d1a22b4e28c912538e6729692afc98f089d9e538ca01c43ab805 (0.8.6+)
  *
  * uriparser - RFC 3986 URI parsing library
  *
diff --git a/include/uriparser/UriBase.h b/include/uriparser/UriBase.h
index 45ba5abd..0c2a5e7e 100644
--- a/include/uriparser/UriBase.h
+++ b/include/uriparser/UriBase.h
@@ -55,7 +55,7 @@
 /* Version */
 #define URI_VER_MAJOR           0
 #define URI_VER_MINOR           8
-#define URI_VER_RELEASE         5
+#define URI_VER_RELEASE         6
 #define URI_VER_SUFFIX_ANSI     ""
 #define URI_VER_SUFFIX_UNICODE  URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)