diff --git a/scaffold.hs b/scaffold.hs
index 8b72e5e6..6bd636a6 100644
--- a/scaffold.hs
+++ b/scaffold.hs
@@ -49,6 +49,7 @@ main = do
 
     writeFile' "simple-server.hs" $(codegen "simple-server_hs")
     writeFile' "fastcgi.hs" $(codegen "fastcgi_hs")
+    writeFile' "devel-server.hs" $(codegen "devel-server_hs")
     writeFile' (project ++ ".cabal") $(codegen "cabal")
     writeFile' "LICENSE" $(codegen "LICENSE")
     writeFile' (sitearg ++ ".hs") $(codegen "sitearg_hs")
diff --git a/scaffold/cabal.cg b/scaffold/cabal.cg
index b9d0d890..452ae3db 100644
--- a/scaffold/cabal.cg
+++ b/scaffold/cabal.cg
@@ -32,6 +32,13 @@ executable         simple-server
     ghc-options:   -Wall
     extensions:    TemplateHaskell, QuasiQuotes, TypeFamilies
 
+executable         devel-server
+    if flag(production)
+        Buildable: False
+    main-is:       devel-server.hs
+    build-depends: wai-handler-devel >= 0.1.0 && < 0.2
+    ghc-options:   -Wall -O2
+
 executable         fastcgi
     if flag(production)
         Buildable: True
diff --git a/scaffold/devel-server_hs.cg b/scaffold/devel-server_hs.cg
new file mode 100644
index 00000000..0d118d7a
--- /dev/null
+++ b/scaffold/devel-server_hs.cg
@@ -0,0 +1,23 @@
+import Network.Wai.Handler.DevelServer (run)
+import Control.Concurrent (forkIO)
+
+main :: IO ()
+main = do
+    mapM_ putStrLn
+        [ "Starting your server process. Code changes will be automatically"
+        , "loaded as you save your files. Type \"quit\" to exit."
+        , "You can view your app at http://localhost:3000/"
+        , ""
+        ]
+    _ <- forkIO () run 3000 "Controller" "with~sitearg~"
+        [ "hamlet"
+        , "cassius"
+        , "julius"
+        ]
+    go
+  where
+    go = do
+        x <- getLine
+        case x of
+            'q':_ -> putStrLn "Quitting, goodbye!"
+            _ -> go
diff --git a/yesod.cabal b/yesod.cabal
index 8d194cb7..d93d159c 100644
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.5.0.4
+version:         0.5.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>