diff --git a/ChangeLog b/ChangeLog
index 40e66c00e6..20d485d2b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 28 04:35:35 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_hmac.c: Fix NO_HMAC warning [Fixes GH-665]
+	  Patched by @vipulnsward https://github.com/ruby/ruby/pull/665
+
 Sun Jul 27 19:49:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* lib/cgi/core.rb: remove unused variables.
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index 0bba44d783..b1e853dde3 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -359,6 +359,6 @@ Init_ossl_hmac()
 void
 Init_ossl_hmac()
 {
-    rb_warning("HMAC will NOT be avaible: OpenSSL is compiled without HMAC.");
+    rb_warning("HMAC is not available: OpenSSL is compiled without HMAC.");
 }
 #endif /* NO_HMAC */