diff --git a/ChangeLog b/ChangeLog
index f0ca0b594e..46a763714a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 14 02:48:16 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/usage.rb: Added. Allows command line programs
+	  to report usage using their initial RDoc comment.
+
 Sat Aug 14 01:25:48 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/token.c: re2c no longer compiled with bit vectors.  caused
diff --git a/MANIFEST b/MANIFEST
index c7034f94e0..eaa424ffd3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -292,6 +292,7 @@ lib/rdoc/ri/ri_util.rb
 lib/rdoc/ri/ri_writer.rb
 lib/rdoc/template.rb
 lib/rdoc/tokenstream.rb
+lib/rdoc/usage.rb
 lib/readbytes.rb
 lib/resolv-replace.rb
 lib/resolv.rb
diff --git a/lib/rdoc/markup/simple_markup/to_flow.rb b/lib/rdoc/markup/simple_markup/to_flow.rb
index d5f6732d5c..ce366d2df7 100644
--- a/lib/rdoc/markup/simple_markup/to_flow.rb
+++ b/lib/rdoc/markup/simple_markup/to_flow.rb
@@ -1,6 +1,6 @@
 require 'rdoc/markup/simple_markup/fragments'
 require 'rdoc/markup/simple_markup/inline'
-
+require 'CGI'
 
 module SM
 
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
index 4c8531aa47..b53a688126 100644
--- a/lib/rdoc/ri/ri_options.rb
+++ b/lib/rdoc/ri/ri_options.rb
@@ -176,16 +176,19 @@ module RI
     end
 
 
-    # Parse command line options.
-
-    def parse
-    
+    def initialize
       @use_stdout   = !STDOUT.tty?
       @width        = 72
       @formatter    = RI::TextFormatter.for("plain") 
       @list_classes = false
       @list_names   = false
+    end
 
+
+    # Parse command line options.
+
+    def parse
+    
       old_argv = ARGV.dup
       if ENV["RI"]
         ARGV.replace(ENV["RI"].split.concat(ARGV))