diff --git a/bin/gollum b/bin/gollum
new file mode 100755
index 00000000..b71f2ce7
--- /dev/null
+++ b/bin/gollum
@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+help = <<HELP
+Gollum is a multi-format Wiki Engine/API/Frontend.
+
+Basic Command Line Usage:
+  gollum [options]
+
+Options:
+HELP
+
+require 'optparse'
+
+require 'rubygems'
+require 'gollum/frontend/app'
+
+exec = {}
+options = {}
+opts = OptionParser.new do |opts|
+  opts.banner = help
+
+  opts.on("--port [PORT]", "Bind port (default port 5432)") do |port|
+    options['port'] = port
+  end
+
+  opts.on("--version", "Display current version") do
+    puts "Gollum " + Gollum::VERSION
+    exit 0
+  end
+end
+
+# Read command line options into `options` hash
+opts.parse!
+
+$path = Dir.pwd
+
+Precious::App.run!
diff --git a/gollum.gemspec b/gollum.gemspec
index 53a5dea8..1eabfaf5 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -17,6 +17,9 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w[lib]
 
+  s.executables = ["gollum"]
+  s.default_executable = 'gollum'
+
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index 12707337..4aa6bb4f 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -1,13 +1,9 @@
-require 'rubygems'
-
 require 'sinatra'
 require 'gollum'
 require 'mustache/sinatra'
 
 require 'gollum/frontend/views/layout'
 
-$path = "~/dev/sandbox/lotr2"
-
 module Precious
   class App < Sinatra::Base
     register Mustache::Sinatra
@@ -106,5 +102,3 @@ module Precious
     end
   end
 end
-
-Precious::App.run!