diff --git a/Yesod/Helpers/Auth2.hs b/Yesod/Helpers/Auth.hs
similarity index 99%
rename from Yesod/Helpers/Auth2.hs
rename to Yesod/Helpers/Auth.hs
index 64614ef3..898e6f4b 100644
--- a/Yesod/Helpers/Auth2.hs
+++ b/Yesod/Helpers/Auth.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE RankNTypes #-}
-module Yesod.Helpers.Auth2
+module Yesod.Helpers.Auth
     ( Auth
     , AuthPlugin (..)
     , AuthRoute (..)
diff --git a/Yesod/Helpers/Auth2/Email.hs b/Yesod/Helpers/Auth/Email.hs
similarity index 99%
rename from Yesod/Helpers/Auth2/Email.hs
rename to Yesod/Helpers/Auth/Email.hs
index 517b6e68..604ed09b 100644
--- a/Yesod/Helpers/Auth2/Email.hs
+++ b/Yesod/Helpers/Auth/Email.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies #-}
-module Yesod.Helpers.Auth2.Email
+module Yesod.Helpers.Auth.Email
     ( authEmail
     , YesodAuthEmail (..)
     , EmailCreds (..)
@@ -7,7 +7,7 @@ module Yesod.Helpers.Auth2.Email
 
 import Yesod
 import Yesod.Mail (randomString)
-import Yesod.Helpers.Auth2
+import Yesod.Helpers.Auth
 import System.Random
 import Control.Monad (when)
 import Control.Applicative ((<$>), (<*>))
diff --git a/Yesod/Helpers/Auth2/Facebook.hs b/Yesod/Helpers/Auth/Facebook.hs
similarity index 97%
rename from Yesod/Helpers/Auth2/Facebook.hs
rename to Yesod/Helpers/Auth/Facebook.hs
index 3acbb4bb..0c9d237e 100644
--- a/Yesod/Helpers/Auth2/Facebook.hs
+++ b/Yesod/Helpers/Auth/Facebook.hs
@@ -1,11 +1,11 @@
 {-# LANGUAGE QuasiQuotes #-}
-module Yesod.Helpers.Auth2.Facebook
+module Yesod.Helpers.Auth.Facebook
     ( authFacebook
     , facebookUrl
     ) where
 
 import Yesod
-import Yesod.Helpers.Auth2
+import Yesod.Helpers.Auth
 import qualified Web.Authenticate.Facebook as Facebook
 import Data.Object (fromMapping, lookupScalar)
 import Data.Maybe (fromMaybe)
diff --git a/Yesod/Helpers/Auth2/OpenId.hs b/Yesod/Helpers/Auth/OpenId.hs
similarity index 97%
rename from Yesod/Helpers/Auth2/OpenId.hs
rename to Yesod/Helpers/Auth/OpenId.hs
index 7f077ceb..341d6c1d 100644
--- a/Yesod/Helpers/Auth2/OpenId.hs
+++ b/Yesod/Helpers/Auth/OpenId.hs
@@ -1,11 +1,11 @@
 {-# LANGUAGE QuasiQuotes #-}
-module Yesod.Helpers.Auth2.OpenId
+module Yesod.Helpers.Auth.OpenId
     ( authOpenId
     , forwardUrl
     ) where
 
 import Yesod
-import Yesod.Helpers.Auth2
+import Yesod.Helpers.Auth
 import qualified Web.Authenticate.OpenId as OpenId
 import Control.Monad.Attempt
 
diff --git a/Yesod/Helpers/Auth2/Rpxnow.hs b/Yesod/Helpers/Auth/Rpxnow.hs
similarity index 96%
rename from Yesod/Helpers/Auth2/Rpxnow.hs
rename to Yesod/Helpers/Auth/Rpxnow.hs
index c7e341b7..321f1caa 100644
--- a/Yesod/Helpers/Auth2/Rpxnow.hs
+++ b/Yesod/Helpers/Auth/Rpxnow.hs
@@ -1,10 +1,10 @@
 {-# LANGUAGE QuasiQuotes #-}
-module Yesod.Helpers.Auth2.Rpxnow
+module Yesod.Helpers.Auth.Rpxnow
     ( authRpxnow
     ) where
 
 import Yesod
-import Yesod.Helpers.Auth2
+import Yesod.Helpers.Auth
 import qualified Web.Authenticate.Rpxnow as Rpxnow
 import Control.Monad (mplus)
 
diff --git a/yesod-auth.cabal b/yesod-auth.cabal
index 75be7e99..33951115 100644
--- a/yesod-auth.cabal
+++ b/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.1.4
+version:         0.2.0
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -15,7 +15,7 @@ library
     build-depends:   base                    >= 4         && < 5
                    , authenticate            >= 0.7       && < 0.8
                    , bytestring              >= 0.9.1.4   && < 0.10
-                   , yesod                   >= 0.5.2     && < 0.6
+                   , yesod                   >= 0.6       && < 0.7
                    , wai                     >= 0.2       && < 0.3
                    , template-haskell
                    , pureMD5                 >= 1.1       && < 1.2
@@ -23,13 +23,13 @@ library
                    , data-object             >= 0.3.1.3   && < 0.4
                    , control-monad-attempt   >= 0.3.0     && < 0.4
                    , utf8-string             >= 0.3.4     && < 0.4
-    exposed-modules: Yesod.Helpers.Auth2
-                     Yesod.Helpers.Auth2.Email
-                     Yesod.Helpers.Auth2.Facebook
-                     Yesod.Helpers.Auth2.OpenId
-                     Yesod.Helpers.Auth2.Rpxnow
+    exposed-modules: Yesod.Helpers.Auth
+                     Yesod.Helpers.Auth.Email
+                     Yesod.Helpers.Auth.Facebook
+                     Yesod.Helpers.Auth.OpenId
+                     Yesod.Helpers.Auth.Rpxnow
     ghc-options:     -Wall
 
 source-repository head
   type:     git
-  location: git://github.com/snoyberg/yesod.git
+  location: git://github.com/snoyberg/yesod-auth.git