diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f848a9521..aa5ba79fc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -18,6 +18,10 @@ class ApplicationController < ActionController::Base
   rescue_from Danbooru::Paginator::PaginationError, :with => :render_pagination_limit
 
 protected
+  def enable_cors
+    response.headers["Access-Control-Allow-Origin"] = "*"
+  end
+  
   def api_check
     if request.format.to_s =~ /\/json|\/xml/ || params[:controller] == "iqdb"
       if ApiLimiter.throttled?(request.remote_ip)
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5939fab32..072120684 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -1,6 +1,7 @@
 class PostsController < ApplicationController
   before_filter :member_only, :except => [:show, :show_seq, :index, :home, :random]
   before_filter :builder_only, :only => [:copy_notes]
+  before_filter :enable_cors, :only => [:index, :show]
   after_filter :save_recent_tags, :only => [:update]
   respond_to :html, :xml, :json
   rescue_from PostSets::SearchError, :with => :rescue_exception