diff --git a/ChangeLog b/ChangeLog
index a01a84aeb4..1eaafce06e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 22 13:03:12 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/ossl_hmac.c: Revert checking return type of
+	  HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
+
 Fri Jul 22 12:10:21 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* tool/rbinstall.rb (default gems):  Install executables into the fake
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index 5d29b8fc55..5220c9e73d 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -70,10 +70,8 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 
     StringValue(key);
     GetHMAC(self, ctx);
-    if (HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
-		 GetDigestPtr(digest), NULL) != 1) {
-	ossl_raise(eHMACError, "HMAC initialization failed.");
-    }
+    HMAC_Init(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
+		 GetDigestPtr(digest));
 
     return self;
 }
@@ -182,9 +180,7 @@ ossl_hmac_reset(VALUE self)
     HMAC_CTX *ctx;
 
     GetHMAC(self, ctx);
-    if (HMAC_Init_ex(ctx, NULL, 0, NULL, NULL) != 1) {
-	ossl_raise(eHMACError, "HMAC initialization failed");
-    }
+    HMAC_Init(ctx, NULL, 0, NULL);
 
     return self;
 }