diff --git a/History.rdoc b/History.rdoc
index 5874a581..14d14ebe 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,3 +1,7 @@
+=== Net::LDAP 0.18.0
+* Fix escaping of # and space in attrs #408
+* Add support to use SNI #406
+
 === Net::LDAP 0.17.1
 * Fixed shebang of bash #385
 * Omit some tests for now until we update our CA cert #386
diff --git a/lib/net/ldap/version.rb b/lib/net/ldap/version.rb
index f531db1c..6ca72fca 100644
--- a/lib/net/ldap/version.rb
+++ b/lib/net/ldap/version.rb
@@ -1,5 +1,5 @@
 module Net
   class LDAP
-    VERSION = "0.17.1"
+    VERSION = "0.18.0"
   end
 end