diff --git a/ChangeLog b/ChangeLog
index 006e088ee6..9addf10942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,12 @@ Tue Aug 22 19:21:00 2006  Minero Aoki  <aamine@loveruby.net>
 	* lib/net/smtp.rb: parameter `to_addrs' might be an Array,
 	  .flatten is required. [ruby-dev:29316]
 
+Tue Aug 22 18:47:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_method):
+	  rdoc documents C module methods as instance methods. a patch in
+	  [ruby-core:08536]. 
+
 Tue Aug 22 12:35:57 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for
diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb
index 3185da7719..a1ea9a5da7 100644
--- a/lib/rdoc/parsers/parse_c.rb
+++ b/lib/rdoc/parsers/parse_c.rb
@@ -523,7 +523,8 @@ module RDoc
           type = "singleton_method"
         end
         meth_obj = AnyMethod.new("", meth_name)
-        meth_obj.singleton = type == "singleton_method" 
+        meth_obj.singleton =
+	  %w{singleton_method module_function}.include?(type) 
         
         p_count = (Integer(param_count) rescue -1)