diff --git a/History.txt b/History.txt
index d01f63b4..29a6a2dd 100644
--- a/History.txt
+++ b/History.txt
@@ -6,6 +6,7 @@
     * Allow .mkd as markdown extension
     * Use $stdout/err instead of constants (#99)
     * Properly wrap code blocks (#91)
+    * Add javascript mime type for webrick (#98)
 
 == 0.5.5
   * Bug Fixes
diff --git a/bin/jekyll b/bin/jekyll
index 3e8469e1..6e03d48b 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -137,9 +137,13 @@ if options['server']
 
   FileUtils.mkdir_p(destination)
 
+  mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
+  mime_types.store 'js', 'application/javascript'
+
   s = HTTPServer.new(
     :Port            => options['server_port'],
-    :DocumentRoot    => destination
+    :DocumentRoot    => destination,
+    :MimeTypes       => mime_types
   )
   t = Thread.new {
     s.start