diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index 470302e689..eb73e19974 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -45,6 +45,7 @@ INSTALLED_APPS = (
     'django.contrib.comments',
     'django.contrib.staticfiles',
     # 3rd party
+    'corsheaders',
     'south',
     'rest_framework_swagger',
     'filetransfers',
@@ -102,6 +103,7 @@ INSTALLED_APPS = (
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -262,3 +264,6 @@ REST_FRAMEWORK = {
         'rest_framework.authentication.SessionAuthentication',
     )
 }
+
+# CORS
+CORS_ORIGIN_ALLOW_ALL = True
diff --git a/requirements/common.txt b/requirements/common.txt
index 504b8a9017..63518975f6 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -6,6 +6,7 @@ Django==1.6.5
 django-filetransfers==0.1.0
 django-pagination==1.0.7
 django-compressor==1.4
+django-cors-headers==0.13
 django-taggit==0.12
 django-mptt==0.6.1
 django-rest-swagger==0.1.14