diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 4fc9d241..c494bb58 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -160,7 +160,7 @@ scaffold = do
     writeFile' ".ghci" $(codegen ".ghci")
     writeFile' "LICENSE" $(codegen "LICENSE")
     writeFile' ("Foundation.hs") $ ifTiny $(codegen "tiny/Foundation.hs") $(codegen "Foundation.hs")
-    writeFile' "Import.hs" $(codegen "Import.hs")
+    writeFile' ("Import.hs") $ ifTiny $(codegen "tiny/Import.hs") $(codegen "Import.hs")
     writeFile' "Application.hs" $ ifTiny $(codegen "tiny/Application.hs") $(codegen "Application.hs")
     writeFile' "Handler/Root.hs" $(codegen "Handler/Root.hs")
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index dd3e7320..cf12bb92 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -8,7 +8,6 @@ module Foundation
     , Form
     , maybeAuth
     , requireAuth
-    , module Yesod
     , module Settings
     , module Model
     ) where
diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg
index cef85920..faff3826 100644
--- a/yesod/scaffold/Import.hs.cg
+++ b/yesod/scaffold/Import.hs.cg
@@ -1,5 +1,6 @@
 module Import
     ( module Prelude
+    , module Yesod
     , module Foundation
     , (<>)
     , Text
@@ -8,6 +9,7 @@ module Import
     ) where
 
 import Prelude hiding (writeFile, readFile)
+import Yesod   hiding (Route(..))
 import Foundation
 import Data.Monoid (Monoid (mappend, mempty, mconcat))
 import Control.Applicative ((<$>), (<*>), pure)
diff --git a/yesod/scaffold/tiny/Import.hs.cg b/yesod/scaffold/tiny/Import.hs.cg
new file mode 100644
index 00000000..cef85920
--- /dev/null
+++ b/yesod/scaffold/tiny/Import.hs.cg
@@ -0,0 +1,18 @@
+module Import
+    ( module Prelude
+    , module Foundation
+    , (<>)
+    , Text
+    , module Data.Monoid
+    , module Control.Applicative
+    ) where
+
+import Prelude hiding (writeFile, readFile)
+import Foundation
+import Data.Monoid (Monoid (mappend, mempty, mconcat))
+import Control.Applicative ((<$>), (<*>), pure)
+import Data.Text (Text)
+
+infixr 5 <>
+(<>) :: Monoid m => m -> m -> m
+(<>) = mappend
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index f0d9acfa..9c3cf333 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -26,6 +26,7 @@ extra-source-files:
   scaffold/Foundation.hs.cg
   scaffold/LICENSE.cg
   scaffold/mongoDBConnPool.cg
+  scaffold/tiny/Import.hs.cg
   scaffold/tiny/Foundation.hs.cg
   scaffold/tiny/project.cabal.cg
   scaffold/tiny/Application.hs.cg