diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 9d9dd48ea95e9..c3927b6613e6a 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -21,6 +21,9 @@ def parse!(args)
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
+          opts.on("-P","--pid=pid",String,
+                  "Specifies the PID file.",
+                  "Default: tmp/pids/server.pid") { |v| options[:pid] = v }
 
           opts.separator ""