diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 9018da3b..538d83c3 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -151,6 +151,7 @@ scaffold = do
     writeFile' "config/keter.yaml" $(codegen "config/keter.yaml")
     writeFile' "app/main.hs" $(codegen "app/main.hs")
     writeFile' "devel.hs" $(codegen "devel.hs")
+    writeFile' ".gitignore" $(codegen ".gitignore")
     writeFile' (project ++ ".cabal") $(codegen "project.cabal")
 
     writeFile' ".ghci" $(codegen ".ghci")
diff --git a/yesod/scaffold/.gitignore.cg b/yesod/scaffold/.gitignore.cg
new file mode 100644
index 00000000..c80b9028
--- /dev/null
+++ b/yesod/scaffold/.gitignore.cg
@@ -0,0 +1,6 @@
+dist/
+static/tmp/
+config/client_session_key.aes
+*.hi
+*.o
+*.sqlite3
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 45f99d96..67454612 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -62,6 +62,7 @@ extra-source-files:
   scaffold/config/robots.txt.cg
   scaffold/config/mongoDB.yml.cg
   scaffold/devel.hs.cg
+  scaffold/.gitignore.cg
 
 library
     build-depends:   base                      >= 4.3      && < 5