diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 4ced4fce..a12096ae 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -9,9 +9,8 @@ module Jekyll
 
         FileUtils.mkdir_p(destination)
 
-        mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
-        mime_types.store 'js', 'application/javascript'
-        mime_types.store 'svg', 'image/svg+xml'
+        mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
+        mime_types = WEBrick::HTTPUtils::load_mime_types(mime_types_file)
 
         s = HTTPServer.new(
           :Port => options['port'],