diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index e1b2fc5447..92297c9714 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Trim down the default mimetypes in config/lighttpd.conf [sam]
+
 * Added script/plugin to manage plugins (install, remove, list, etc) [Ryan Tomayko]
 
 * Added test_plugins task: Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name) [DHH]
diff --git a/railties/configs/lighttpd.conf b/railties/configs/lighttpd.conf
index 80a6703b37..e169ee210c 100644
--- a/railties/configs/lighttpd.conf
+++ b/railties/configs/lighttpd.conf
@@ -27,50 +27,14 @@ fastcgi.server = ( ".fcgi" =>
 )
 
 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",
+  ".gif"        =>  "image/gif",
   ".htm"        =>  "text/html",
+  ".html"       =>  "text/html",
+  ".jpeg"       =>  "image/jpeg",
+  ".jpg"        =>  "image/jpeg",
   ".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
+  ".png"        =>  "image/png",
+  ".swf"        =>  "application/x-shockwave-flash",
+  ".txt"        =>  "text/plain"
+)