diff --git a/CHANGES.md b/CHANGES.md
index 9523c9dc..de909791 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
-## master (unreleased)
+## 0.8.11 (2015-05-22)
 
-* _the future is unwritten_
+* SNI support for HTTPS connections. See #229. (@tarcieri)
 * Use "http.rb" in the User-Agent string. See #227. (@tarcieri)
 
 
diff --git a/lib/http/timeout/null.rb b/lib/http/timeout/null.rb
index 175173b1..c52088f9 100644
--- a/lib/http/timeout/null.rb
+++ b/lib/http/timeout/null.rb
@@ -26,6 +26,7 @@ def connect_ssl
       # Configures the SSL connection and starts the connection
       def start_tls(host, ssl_socket_class, ssl_context)
         @socket = ssl_socket_class.new(socket, ssl_context)
+        @socket.hostname = host if @socket.respond_to? :hostname=
         @socket.sync_close = true if @socket.respond_to? :sync_close=
 
         connect_ssl
diff --git a/lib/http/version.rb b/lib/http/version.rb
index 5c29164b..9f9aeb87 100644
--- a/lib/http/version.rb
+++ b/lib/http/version.rb
@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 end