diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 5d680f4a..ed7fb59f 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -25,6 +25,8 @@ module Jekyll
 
         s = HTTPServer.new(webrick_options(options))
 
+        s.config.store(:DirectoryIndex, s.config[:DirectoryIndex] << "index.xml")
+
         s.mount(options['baseurl'], HTTPServlet::FileHandler, destination, fh_option)
 
         Jekyll.logger.info "Server address:", "http://#{s.config[:BindAddress]}:#{s.config[:Port]}"