diff --git a/railties/bin/lighttpd b/railties/bin/lighttpd
new file mode 100644
index 0000000000..0820ff5903
--- /dev/null
+++ b/railties/bin/lighttpd
@@ -0,0 +1,10 @@
+#!/usr/local/bin/ruby
+
+if RUBY_PLATFORM !~ /mswin/ && `lighttpd -version 2>/dev/null`.size > 0
+  puts "=> Rails application started on http://0.0.0.0:3000"
+  puts "=> Ctrl-C to shutdown server"
+
+  `lighttpd -D -f #{File.dirname(__FILE__) + "/../"}/config/lighttpd.conf`
+else
+  puts "lighttpd is not available on your system"
+end
\ No newline at end of file
diff --git a/railties/configs/lighttpd.conf b/railties/configs/lighttpd.conf
new file mode 100644
index 0000000000..f9ab45263b
--- /dev/null
+++ b/railties/configs/lighttpd.conf
@@ -0,0 +1,74 @@
+# Default configuration file for the lighttpd web server
+# Start using ./script/lighttpd
+
+server.port = 3000
+
+server.modules           = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi" )
+server.error-handler-404 = "/dispatch.fcgi"
+server.document-root     = "public/"
+
+server.errorlog          = "log/lighttpd.error.log"
+accesslog.filename       = "log/lighttpd.access.log"
+
+url.rewrite              = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
+
+fastcgi.server = ( ".fcgi" =>
+  ( "localhost" =>
+      (
+        "min-procs" => 2, 
+        "max-procs" => 2,
+        "socket"    => "log/fcgi.socket",
+        "bin-path"  => "public/dispatch.fcgi",
+        "bin-environment" => ( "RAILS_ENV" => "development" )
+      )
+  )
+)
+
+mimetype.assign = (  
+  ".pdf"        =>  "application/pdf",
+  ".sig"        =>  "application/pgp-signature",
+  ".spl"        =>  "application/futuresplash",
+  ".class"      =>  "application/octet-stream",
+  ".ps"         =>  "application/postscript",
+  ".torrent"    =>  "application/x-bittorrent",
+  ".dvi"        =>  "application/x-dvi",
+  ".gz"         =>  "application/x-gzip",
+  ".pac"        =>  "application/x-ns-proxy-autoconfig",
+  ".swf"        =>  "application/x-shockwave-flash",
+  ".tar.gz"     =>  "application/x-tgz",
+  ".tgz"        =>  "application/x-tgz",
+  ".tar"        =>  "application/x-tar",
+  ".zip"        =>  "application/zip",
+  ".mp3"        =>  "audio/mpeg",
+  ".m3u"        =>  "audio/x-mpegurl",
+  ".wma"        =>  "audio/x-ms-wma",
+  ".wax"        =>  "audio/x-ms-wax",
+  ".ogg"        =>  "audio/x-wav",
+  ".wav"        =>  "audio/x-wav",
+  ".gif"        =>  "image/gif",
+  ".jpg"        =>  "image/jpeg",
+  ".jpeg"       =>  "image/jpeg",
+  ".png"        =>  "image/png",
+  ".xbm"        =>  "image/x-xbitmap",
+  ".xpm"        =>  "image/x-xpixmap",
+  ".xwd"        =>  "image/x-xwindowdump",
+  ".css"        =>  "text/css",
+  ".html"       =>  "text/html",
+  ".htm"        =>  "text/html",
+  ".js"         =>  "text/javascript",
+  ".asc"        =>  "text/plain",
+  ".c"          =>  "text/plain",
+  ".conf"       =>  "text/plain",
+  ".text"       =>  "text/plain",
+  ".txt"        =>  "text/plain",
+  ".dtd"        =>  "text/xml",
+  ".xml"        =>  "text/xml",
+  ".mpeg"       =>  "video/mpeg",
+  ".mpg"        =>  "video/mpeg",
+  ".mov"        =>  "video/quicktime",
+  ".qt"         =>  "video/quicktime",
+  ".avi"        =>  "video/x-msvideo",
+  ".asf"        =>  "video/x-ms-asf",
+  ".asx"        =>  "video/x-ms-asf",
+  ".wmv"        =>  "video/x-ms-wmv"
+)
\ No newline at end of file