diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index 03e50b33f..7f5706835 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -1003,6 +1003,7 @@
     "WebGUI::Content::Wizard",
     "WebGUI::Content::Operation",
     "WebGUI::Content::Setup",
+    "WebGUI::Content::FacebookAuth",
     "WebGUI::Content::Shop",
     "WebGUI::Content::SiteIndex",
     "WebGUI::Content::Asset",
diff --git a/lib/WebGUI/Content/FacebookAuth.pm b/lib/WebGUI/Content/FacebookAuth.pm
new file mode 100644
index 000000000..c7b2e04c1
--- /dev/null
+++ b/lib/WebGUI/Content/FacebookAuth.pm
@@ -0,0 +1,52 @@
+package WebGUI::Content::FacebookAuth;
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+  WebGUI is Copyright 2001-2010 Plain Black Corporation.
+ -------------------------------------------------------------------
+  Please read the legal notices (docs/legal.txt) and the license
+  (docs/license.txt) that came with this distribution before using
+  this software.
+ -------------------------------------------------------------------
+  http://www.plainblack.com                     info@plainblack.com
+ -------------------------------------------------------------------
+
+=cut
+
+use strict;
+use WebGUI::Auth::Facebook;
+
+=head1 NAME
+
+Package WebGUI::Content::FacebookAuth;
+
+=head1 DESCRIPTION
+
+Because is Facebook is dumb, and changed their API to no longer use query parameters, this module exists to handle the auth postback.
+
+=head1 SUBROUTINES
+
+These subroutines are available from this package:
+
+=cut
+
+#-------------------------------------------------------------------
+
+=head2 handler ( session ) 
+
+The content handler for this package.
+
+=cut
+
+sub handler {
+    my ($session) = @_;
+    if ($session->scratch->get('waiting_for_facebook_auth_postback')) {
+ 	$session->scratch->delete('waiting_for_facebook_auth_postback');
+        WebGUI::Auth::Facebook->new($session)->www_callback;
+    }
+    return undef;
+}
+
+1;
+#vim:ft=perl