diff --git a/authenticate-oauth/LICENSE b/authenticate-oauth/LICENSE
new file mode 100644
index 00000000..11dc17a1
--- /dev/null
+++ b/authenticate-oauth/LICENSE
@@ -0,0 +1,25 @@
+The following license covers this documentation, and the source code, except
+where otherwise indicated.
+
+Copyright 2008, Michael Snoyman. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/authenticate-oauth/Setup.lhs b/authenticate-oauth/Setup.lhs
new file mode 100755
index 00000000..06e2708f
--- /dev/null
+++ b/authenticate-oauth/Setup.lhs
@@ -0,0 +1,7 @@
+#!/usr/bin/env runhaskell
+
+> module Main where
+> import Distribution.Simple
+
+> main :: IO ()
+> main = defaultMain
diff --git a/authenticate/Web/Authenticate/OAuth.hs b/authenticate-oauth/Web/Authenticate/OAuth.hs
similarity index 100%
rename from authenticate/Web/Authenticate/OAuth.hs
rename to authenticate-oauth/Web/Authenticate/OAuth.hs
diff --git a/authenticate-oauth/authenticate-oauth.cabal b/authenticate-oauth/authenticate-oauth.cabal
new file mode 100644
index 00000000..973fdee4
--- /dev/null
+++ b/authenticate-oauth/authenticate-oauth.cabal
@@ -0,0 +1,34 @@
+name:            authenticate-oauth
+version:         1.0.0
+license:         BSD3
+license-file:    LICENSE
+author:          Hiromi Ishii
+maintainer:      Hiromi Ishii
+synopsis:        Authentication methods for Haskell web applications.
+description:     Focus is on third-party authentication methods, such as OpenID and BrowserID.
+category:        Web
+stability:       Stable
+cabal-version:   >= 1.6
+build-type:      Simple
+homepage:        http://github.com/yesodweb/authenticate
+
+library
+    build-depends:   base                          >= 4        && < 5
+                   , http-conduit                  >= 1.2      && < 1.3
+                   , transformers                  >= 0.1      && < 0.3
+                   , bytestring                    >= 0.9
+                   , RSA                           >= 1.0      && < 1.1
+                   , time
+                   , base64-bytestring             >= 0.1      && < 0.2
+                   , SHA                           >= 1.4      && < 1.6
+                   , random
+                   , http-types                    >= 0.6      && < 0.7
+                   , blaze-builder
+                   , conduit                       >= 0.0      && < 0.2
+                   , blaze-builder-conduit         >= 0.0      && < 0.1
+    exposed-modules: Web.Authenticate.OAuth
+    ghc-options:     -Wall
+
+source-repository head
+  type:     git
+  location: git://github.com/yesodweb/authenticate.git
diff --git a/authenticate/authenticate.cabal b/authenticate/authenticate.cabal
index 4e9b64cd..223a0a03 100644
--- a/authenticate/authenticate.cabal
+++ b/authenticate/authenticate.cabal
@@ -41,7 +41,6 @@ library
                      Web.Authenticate.OpenId,
                      Web.Authenticate.BrowserId,
                      Web.Authenticate.OpenId.Providers,
-                     Web.Authenticate.OAuth,
                      Web.Authenticate.Kerberos
     other-modules:   Web.Authenticate.Internal,
                      OpenId2.Discovery,