diff --git a/ChangeLog b/ChangeLog
index 52d28d33d8..c0be0ba772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 21 09:33:17 2015  Karol Bucek  <kares@users.noreply.github.com>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket): fix
+	  NotImplementedError typo.  [Fix GH-1165]
+
 Sun Dec 20 20:54:51 2015  Takashi Kokubun  <takashikkbn@gmail.com>
 
 	* cgi/escape/escape.c: Optimize CGI.escapeHTML for
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 41a09f18f4..57519f2c21 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -251,7 +251,7 @@ module OpenSSL
       include SocketForwarder
 
       if ExtConfig::OPENSSL_NO_SOCK
-        def initialize(io, ctx = nil); raise NotImplmentedError; end
+        def initialize(io, ctx = nil); raise NotImplementedError; end
       else
         if ExtConfig::HAVE_TLSEXT_HOST_NAME
           attr_accessor :hostname