diff --git a/sources.txt b/sources.txt
index ef9a273b..f07f1d52 100644
--- a/sources.txt
+++ b/sources.txt
@@ -6,6 +6,5 @@
 ./yesod-form
 ./yesod-auth
 ./yesod-sitemap
-./yesod-default
 ./yesod-test
 ./yesod
diff --git a/yesod-default/LICENSE b/yesod-default/LICENSE
deleted file mode 100644
index d9f04179..00000000
--- a/yesod-default/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2012 Michael Snoyman, http://www.yesodweb.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/yesod-default/README b/yesod-default/README
deleted file mode 100644
index e69de29b..00000000
diff --git a/yesod-default/Setup.lhs b/yesod-default/Setup.lhs
deleted file mode 100755
index 06e2708f..00000000
--- a/yesod-default/Setup.lhs
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env runhaskell
-
-> module Main where
-> import Distribution.Simple
-
-> main :: IO ()
-> main = defaultMain
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
deleted file mode 100644
index dec592c5..00000000
--- a/yesod-default/yesod-default.cabal
+++ /dev/null
@@ -1,51 +0,0 @@
-name:            yesod-default
-version:         1.2.0
-license:         MIT
-license-file:    LICENSE
-author:          Patrick Brisbin
-maintainer:      Patrick Brisbin <pbrisbin@gmail.com>
-synopsis:        Default config and main functions for your yesod application
-category:        Web, Yesod
-stability:       Stable
-cabal-version:   >= 1.6
-build-type:      Simple
-homepage:        http://www.yesodweb.com/
-description:     Convenient wrappers for your the configuration and
-                 execution of your yesod application
-
-library
-    if os(windows)
-        cpp-options: -DWINDOWS
-
-    build-depends:   base                  >= 4       && < 5
-                   , yesod-core            >= 1.2     && < 1.3
-                   , warp                  >= 1.3     && < 1.4
-                   , wai                   >= 1.4     && < 1.5
-                   , wai-extra             >= 1.3     && < 1.4
-                   , bytestring            >= 0.9.1.4
-                   , transformers          >= 0.2.2   && < 0.4
-                   , text                  >= 0.9
-                   , directory             >= 1.0
-                   , shakespeare-css       >= 1.0     && < 1.1
-                   , shakespeare-js        >= 1.0     && < 1.2
-                   , template-haskell
-                   , yaml                  >= 0.8     && < 0.9
-                   , network-conduit       >= 0.5
-                   , unordered-containers
-                   , hamlet                >= 1.1     && < 1.2
-                   , data-default
-                   , safe
-
-    if !os(windows)
-         build-depends: unix
-
-    exposed-modules: Yesod.Default.Config
-                   , Yesod.Default.Main
-                   , Yesod.Default.Util
-                   , Yesod.Default.Handlers
-
-    ghc-options:     -Wall
-
-source-repository head
-  type:     git
-  location: https://github.com/yesodweb/yesod
diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod/Yesod/Default/Config.hs
similarity index 100%
rename from yesod-default/Yesod/Default/Config.hs
rename to yesod/Yesod/Default/Config.hs
diff --git a/yesod-default/Yesod/Default/Handlers.hs b/yesod/Yesod/Default/Handlers.hs
similarity index 100%
rename from yesod-default/Yesod/Default/Handlers.hs
rename to yesod/Yesod/Default/Handlers.hs
diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod/Yesod/Default/Main.hs
similarity index 100%
rename from yesod-default/Yesod/Default/Main.hs
rename to yesod/Yesod/Default/Main.hs
diff --git a/yesod-default/Yesod/Default/Util.hs b/yesod/Yesod/Default/Util.hs
similarity index 100%
rename from yesod-default/Yesod/Default/Util.hs
rename to yesod/Yesod/Default/Util.hs
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 5897ff86..f5c2dcbf 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -32,7 +32,6 @@ library
                    , yesod-auth                >= 1.2      && < 1.3
                    , yesod-persistent          >= 1.2      && < 1.3
                    , yesod-form                >= 1.3      && < 1.4
-                   , yesod-default             >= 1.2      && < 1.3
                    , monad-control             >= 0.3      && < 0.4
                    , transformers              >= 0.2.2    && < 0.4
                    , wai                       >= 1.3      && < 1.5
@@ -44,10 +43,19 @@ library
                    , blaze-html                >= 0.5
                    , blaze-markup              >= 0.5.1
                    , aeson
+                   , safe
+                   , data-default
 
     exposed-modules: Yesod
+                   , Yesod.Default.Config
+                   , Yesod.Default.Main
+                   , Yesod.Default.Util
+                   , Yesod.Default.Handlers
     ghc-options:     -Wall
 
+    if !os(windows)
+         build-depends: unix
+
 executable             yesod-ghc-wrapper
     main-is: ghcwrapper.hs
     build-depends: