diff --git a/Gemfile b/Gemfile
index 67c3a7f..8587adc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,9 @@ gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
 gem 'grape',                    '~> 0.8.0'
 gem 'grape-entity'
 gem 'grape-swagger'
+gem 'rack-cors'
+gem 'rack-contrib'
+
 #gem 'grape-swagger-rails'
 
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
diff --git a/config/application.rb b/config/application.rb
index 0775e71..6dc3285 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -133,5 +133,12 @@ module Noosfero
 
     Noosfero::Plugin.setup(config)
 
+    config.middleware.use Rack::Cors do
+      allow do
+        origins '*'
+        resource 'api/*', :headers => :any, :methods => [:get, :post]
+      end
+    end
+
   end
 end
diff --git a/lib/noosfero/api/api.rb b/lib/noosfero/api/api.rb
index 4d2927e..efc56f7 100644
--- a/lib/noosfero/api/api.rb
+++ b/lib/noosfero/api/api.rb
@@ -1,8 +1,11 @@
 require 'grape'
+#require 'rack/contrib'
 Dir["#{Rails.root}/lib/noosfero/api/*.rb"].each {|file| require file}
 module Noosfero
   module API
     class API < Grape::API
+      use Rack::JSONP
+
       before { start_log }
       before { setup_multitenancy }
       before { detect_stuff_by_domain }
--
libgit2 0.21.2