diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index 58622f543e..5745661c3c 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -21,8 +21,13 @@
 module OpenSSL
   module Digest
 
-    %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1).each{|digest|
-      eval(<<-EOD)
+    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
+    if OPENSSL_VERSION_NUMBER > 0x00908000
+      alg += %w(SHA224 SHA256 SHA384 SHA512)
+    end
+
+    alg.each{|digest|
+      self.module_eval(<<-EOD)
         class #{digest} < Digest
           def initialize(data=nil)
             super(\"#{digest}\", data)
diff --git a/test/openssl/test_digest.rb b/test/openssl/test_digest.rb
index b169b802a8..da5b6e49c5 100644
--- a/test/openssl/test_digest.rb
+++ b/test/openssl/test_digest.rb
@@ -60,6 +60,15 @@ class OpenSSL::TestDigest < Test::Unit::TestCase
     dig2 = @d1.digest
     assert_equal(dig1, dig2, "reset")
   end
+
+  if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
+    def test_098_features
+      assert_equal("abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5", OpenSSL::Digest::SHA224.hexdigest("a"))
+      assert_equal("ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb", OpenSSL::Digest::SHA256.hexdigest("a"))
+      assert_equal("54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31", OpenSSL::Digest::SHA384.hexdigest("a"))
+      assert_equal("1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75", OpenSSL::Digest::SHA512.hexdigest("a"))
+    end
+  end
 end
 
 end