diff --git a/addons/auth_oauth/__init__.py b/addons/auth_oauth/__init__.py
new file mode 100644
index 00000000000..a55097cb836
--- /dev/null
+++ b/addons/auth_oauth/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
\ No newline at end of file
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
new file mode 100644
index 00000000000..68f4d2ccd87
--- /dev/null
+++ b/addons/auth_oauth/__openerp__.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'OAuth2 Authentication',
+    'version': '1.0',
+    'category': 'Tools',
+    'description': """Allow users to login through Google OAuth2.""",
+    'author': 'Victor Tabuenca',
+    'maintainer': 'OpenERP s.a.',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'web'],
+    'data': [
+    ],
+    'js': [
+        'static/src/js/auth_oauth.js',
+    ],
+    'css': [
+        'static/src/css/auth_oauth.css',
+    ],
+    'qweb': [
+        'static/src/xml/auth_oauth.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/addons/auth_oauth/static/src/css/auth_oauth.css b/addons/auth_oauth/static/src/css/auth_oauth.css
new file mode 100644
index 00000000000..c8e0efe4c32
--- /dev/null
+++ b/addons/auth_oauth/static/src/css/auth_oauth.css
@@ -0,0 +1,2 @@
+.oe_login_oauth {
+}
\ No newline at end of file
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
new file mode 100644
index 00000000000..fddd4c78ae9
--- /dev/null
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -0,0 +1,18 @@
+openerp.auth_oauth = function(instance) {
+
+    var QWeb = instance.web.qweb;
+
+    instance.web.Login = instance.web.Login.extend({
+        start: function() {
+            console.log("Tu puta madre!");
+            this._super.apply(this, arguments);
+        },
+        on_submit: function(ev) {
+        },
+        do_warn: function(title, msg) {
+        },
+        reset_error_message: function() {
+        }
+    });
+
+};
\ No newline at end of file
diff --git a/addons/auth_oauth/static/src/xml/auth_oauth.xml b/addons/auth_oauth/static/src/xml/auth_oauth.xml
new file mode 100644
index 00000000000..01cf51da9a2
--- /dev/null
+++ b/addons/auth_oauth/static/src/xml/auth_oauth.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-extend="Login">
+        <t t-jquery=".oe_login_pane form ul" t-operation="after">
+            <ul class="oe_login_oauth">
+                <li>OR</li>
+                <li>Login with Google</li>
+                <li>Me cago en tu puta madre</li>
+            </ul>
+        </t>
+    </t>
+
+</templates>
\ No newline at end of file