diff --git a/Gemfile b/Gemfile
index 514329c0a59..99e71f0b570 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem "openid-redis-store"
 gem "omniauth-facebook"
 gem "omniauth-twitter"
 gem "omniauth-github"
+gem "omniauth-browserid", :git => "git://github.com/callahad/omniauth-browserid.git", :branch => "observer_api"
 gem 'oj'
 gem 'pbkdf2'
 gem 'pg'
diff --git a/Gemfile.lock b/Gemfile.lock
index a5a628f603d..6d9dd20479d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,16 @@ GIT
     rack-mini-profiler (0.1.23)
       rack (>= 1.1.3)
 
+GIT
+  remote: git://github.com/callahad/omniauth-browserid.git
+  revision: af62d667626c1622de6fe13b60849c3640765ab1
+  branch: observer_api
+  specs:
+    omniauth-browserid (0.0.2)
+      faraday
+      multi_json
+      omniauth (~> 1.0)
+
 GIT
   remote: git://github.com/emberjs/ember-rails.git
   revision: 57bbe3202725e55a8e4eaccba83d663b26bcf024
@@ -490,6 +500,7 @@ DEPENDENCIES
   nokogiri
   oj
   omniauth
+  omniauth-browserid!
   omniauth-facebook
   omniauth-github
   omniauth-openid
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 838006e8a23..5c393bdc2ce 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -31,4 +31,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
            SiteSetting.github_client_id,
            SiteSetting.github_client_secret
 
+  provider :browser_id,
+           :name => 'persona'
+
 end