diff --git a/ChangeLog b/ChangeLog
index a2f6b39..f9ddc94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-03  Laurent Sansonetti  <lsansonetti@apple.com>
+
+	* bin/rdoc-osa:
+	Do not call Config.datadir anymore (possible incompatibility with 1.8.6).
+
 2007-03-28  Laurent Sansonetti  <lsansonetti@apple.com>
 
 	* src/lib/rbosa_properties.rb:
diff --git a/bin/rdoc-osa b/bin/rdoc-osa
index e3c1a0b..f78adaf 100644
--- a/bin/rdoc-osa
+++ b/bin/rdoc-osa
@@ -166,7 +166,7 @@ module #{mod.name}; end
 EOS
 
 rdoc_flags = ''
-template = File.join(Config.datadir('rubyosa'), 'rdoc_html.rb')
+template = File.join(Config::CONFIG['datadir'], 'rubyosa', 'rdoc_html.rb')
 if File.exists?(template)
     rdoc_flags << " --template '#{template}' "
 end