diff --git a/lib/hub/standalone.rb b/lib/hub/standalone.rb
index 3034a435a..d88bf827f 100644
--- a/lib/hub/standalone.rb
+++ b/lib/hub/standalone.rb
@@ -16,7 +16,8 @@ module Standalone
 
 premable
 
-    POSTAMBLE = "Hub::Runner.execute(*ARGV)"
+    POSTAMBLE = "Hub::Runner.execute(*ARGV)\n"
+    MANPAGE   = "__END__\n#{File.read('man/hub.1')}"
 
     def save(filename, path = '.')
       target = File.join(File.expand_path(path), filename)
@@ -43,6 +44,7 @@ def build
       end
 
       standalone << POSTAMBLE
+      standalone << MANPAGE
       standalone
     end
   end
diff --git a/test/standalone_test.rb b/test/standalone_test.rb
index 8dd890567..77b4aaef9 100644
--- a/test/standalone_test.rb
+++ b/test/standalone_test.rb
@@ -25,11 +25,12 @@ def test_standalone
     assert_includes "Commands", standalone
     assert_includes ".execute(*ARGV)", standalone
     assert_not_includes "module Standalone", standalone
+    assert_equal File.read('man/hub.1'), standalone.scan(/__END__\s*(.+)/m).to_s
   end
 
   def test_standalone_save
     Hub::Standalone.save("hub")
-    assert_equal Hub::Standalone.build + "\n", File.read('./hub')
+    assert_equal Hub::Standalone.build, File.read('./hub')
   end
 
   def test_standalone_save_permission_denied