diff --git a/lib/pith/server.rb b/lib/pith/server.rb
index <HASH>..<HASH> 100644
--- a/lib/pith/server.rb
+++ b/lib/pith/server.rb
@@ -12,6 +12,7 @@ module Pith
         use Rack::Lint
         use Pith::Server::AutoBuild, project
         use Adsf::Rack::IndexFileFinder, :root => project.output_dir
+        use Pith::Server::DefaultToHtml, project.output_dir
         run Rack::Directory.new(project.output_dir)
       end
     end
@@ -21,7 +22,7 @@ module Pith
     end
 
     extend self
-    
+
     class AutoBuild
 
       def initialize(app, project)
@@ -36,6 +37,29 @@ module Pith
 
     end
 
+    class DefaultToHtml
+
+      def initialize(app, root)
+        @app  = app
+        @root = root
+      end
+
+      def call(env)
+
+        path_info = ::Rack::Utils.unescape(env["PATH_INFO"])
+        file = "#{@root}#{path_info}"
+        unless File.exist?(file)
+          if File.exist?("#{file}.html")
+            env["PATH_INFO"] += ".html"
+          end
+        end
+
+        @app.call(env)
+
+      end
+
+    end
+
   end
 
 end
Magically append missing ".html" extension to requests.

(dumb-ass broken impl of content negotiation)