diff --git a/Rakefile b/Rakefile
index c0e7a17..11898ae 100644
--- a/Rakefile
+++ b/Rakefile
@@ -27,7 +27,7 @@ task :before_doc do
 end
 
 Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = 'doc'
+    rdoc.rdoc_dir = 'doc/rdoc'
     rdoc.options += RDOC_OPTS
     rdoc.template = "extras/flipbook_rdoc.rb"
     rdoc.main = "README"
@@ -38,9 +38,9 @@ end
 task :after_doc do
     mv "lib/camping.rb", "lib/camping-unabridged.rb"
     mv "lib/camping-mural.rb", "lib/camping.rb"
-    cp "extras/Camping.gif", "doc/"
-    cp "extras/permalink.gif", "doc/"
-    sh %{scp -r doc/* #{ENV['USER']}@rubyforge.org:/var/www/gforge-projects/camping/}
+    cp "extras/Camping.gif", "doc/rdoc/"
+    cp "extras/permalink.gif", "doc/rdoc/"
+    sh %{scp -r doc/rdoc/* #{ENV['USER']}@rubyforge.org:/var/www/gforge-projects/camping/}
 end
 
 spec =
@@ -64,7 +64,7 @@ spec =
         s.required_ruby_version = '>= 1.8.2'
 
         s.files = %w(COPYING README Rakefile) +
-          Dir.glob("{bin,doc/rdoc,test,lib,extras}/**/*") + 
+          Dir.glob("{bin,doc,test,lib,extras}/**/*") + 
           Dir.glob("ext/**/*.{h,c,rb}") +
           Dir.glob("examples/**/*.rb") +
           Dir.glob("tools/*.rb")
diff --git a/bin/camping b/bin/camping
index cbb5d2f..c169cc2 100755
--- a/bin/camping
+++ b/bin/camping
@@ -40,13 +40,13 @@ opts = OptionParser.new do |opts|
   
     # No argument, shows at tail.  This will print an options summary.
     # Try it and see!
-    opts.on_tail("-h", "--help", "Show this message") do
+    opts.on_tail("-?", "--help", "Show this message") do
         puts opts
         exit
     end
   
     # Another typical switch to print the version.
-    opts.on_tail("--version", "Show version") do
+    opts.on_tail("-v", "--version", "Show version") do
         class << Gem; attr_accessor :loaded_specs; end
         puts Gem.loaded_specs['camping'].version
         exit
diff --git a/doc/camping.1.gz b/doc/camping.1.gz
new file mode 100644
index 0000000..b674903
Binary files /dev/null and b/doc/camping.1.gz differ