diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a989cd8f63..4ffdd03a2f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -820,6 +820,7 @@ phutil_register_library_map(array(
     'PhabricatorAuthProviderOAuth' => 'applications/auth/provider/PhabricatorAuthProviderOAuth.php',
     'PhabricatorAuthProviderOAuthDisqus' => 'applications/auth/provider/PhabricatorAuthProviderOAuthDisqus.php',
     'PhabricatorAuthProviderOAuthFacebook' => 'applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php',
+    'PhabricatorAuthProviderOAuthGitHub' => 'applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php',
     'PhabricatorAuthProviderPassword' => 'applications/auth/provider/PhabricatorAuthProviderPassword.php',
     'PhabricatorAuthRegisterController' => 'applications/auth/controller/PhabricatorAuthRegisterController.php',
     'PhabricatorAuthStartController' => 'applications/auth/controller/PhabricatorAuthStartController.php',
@@ -2681,6 +2682,7 @@ phutil_register_library_map(array(
     'PhabricatorAuthProviderOAuth' => 'PhabricatorAuthProvider',
     'PhabricatorAuthProviderOAuthDisqus' => 'PhabricatorAuthProviderOAuth',
     'PhabricatorAuthProviderOAuthFacebook' => 'PhabricatorAuthProviderOAuth',
+    'PhabricatorAuthProviderOAuthGitHub' => 'PhabricatorAuthProviderOAuth',
     'PhabricatorAuthProviderPassword' => 'PhabricatorAuthProvider',
     'PhabricatorAuthRegisterController' => 'PhabricatorAuthController',
     'PhabricatorAuthStartController' => 'PhabricatorAuthController',
diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php b/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php
index 2dd1795015..7a04039ea1 100644
--- a/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php
+++ b/src/applications/auth/provider/PhabricatorAuthProviderOAuthFacebook.php
@@ -12,11 +12,7 @@ final class PhabricatorAuthProviderOAuthFacebook
   }
 
   public function isEnabled() {
-
-    // TODO: Remove this once we switch to the new auth mechanism.
-
-    return false &&
-           parent::isEnabled() &&
+    return parent::isEnabled() &&
            PhabricatorEnv::getEnvConfig('facebook.auth-enabled');
   }
 
diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php b/src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php
new file mode 100644
index 0000000000..f61b7a8ec3
--- /dev/null
+++ b/src/applications/auth/provider/PhabricatorAuthProviderOAuthGitHub.php
@@ -0,0 +1,47 @@
+<?php
+
+final class PhabricatorAuthProviderOAuthGitHub
+  extends PhabricatorAuthProviderOAuth {
+
+  public function getProviderName() {
+    return pht('GitHub');
+  }
+
+  protected function newOAuthAdapter() {
+    return new PhutilAuthAdapterOAuthGitHub();
+  }
+
+  public function isEnabled() {
+    return parent::isEnabled() &&
+           PhabricatorEnv::getEnvConfig('github.auth-enabled');
+  }
+
+  protected function getOAuthClientID() {
+    return PhabricatorEnv::getEnvConfig('github.application-id');
+  }
+
+  protected function getOAuthClientSecret() {
+    $secret = PhabricatorEnv::getEnvConfig('github.application-secret');
+    if ($secret) {
+      return new PhutilOpaqueEnvelope($secret);
+    }
+    return null;
+  }
+
+  public function shouldAllowLogin() {
+    return true;
+  }
+
+  public function shouldAllowRegistration() {
+    return PhabricatorEnv::getEnvConfig('github.registration-enabled');
+  }
+
+  public function shouldAllowAccountLink() {
+    return true;
+  }
+
+  public function shouldAllowAccountUnlink() {
+    return !PhabricatorEnv::getEnvConfig('github.auth-permanent');
+  }
+
+}