diff --git a/ChangeLog b/ChangeLog
index da65ec61d8..de9a3fded3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 14 17:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
+	  extensions.  [ruby-dev:30972]
+
 Thu Jun 14 14:40:42 2007  Tanaka Akira  <akr@fsij.org>
 
 	* lib/securerandom.rb: documente updated.
diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb
index ec9ae1877d..49f53b5e08 100644
--- a/lib/rdoc/parsers/parse_c.rb
+++ b/lib/rdoc/parsers/parse_c.rb
@@ -169,7 +169,7 @@ module RDoc
     attr_accessor :progress
 
     extend ParserFactory
-    parse_files_matching(/\.(c|cc|cpp|CC)$/)
+    parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
 
     @@enclosure_classes = {}
     @@known_bodies = {}