diff --git a/playbooks/roles/nginx/templates/cms.j2 b/playbooks/roles/nginx/templates/cms.j2
index 5267d7c..f2dd7a0 100644
--- a/playbooks/roles/nginx/templates/cms.j2
+++ b/playbooks/roles/nginx/templates/cms.j2
@@ -38,6 +38,11 @@ server {
   
   rewrite ^(.*)/favicon.ico$ /static/images/favicon.ico last;
 
+  # http://www.red-team-design.com/firefox-doesnt-allow-cross-domain-fonts-by-default
+  location ~* \.(eot|otf|ttf|woff)$ {
+    add_header Access-Control-Allow-Origin *;
+  }
+
   location @proxy_to_cms_app {
     proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
     proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
diff --git a/playbooks/roles/nginx/templates/lms.j2 b/playbooks/roles/nginx/templates/lms.j2
index 034f46a..f4c8b35 100644
--- a/playbooks/roles/nginx/templates/lms.j2
+++ b/playbooks/roles/nginx/templates/lms.j2
@@ -35,6 +35,10 @@ server {
 
   rewrite ^(.*)/favicon.ico$ /static/images/favicon.ico last;
 
+  # http://www.red-team-design.com/firefox-doesnt-allow-cross-domain-fonts-by-default
+  location ~* \.(eot|otf|ttf|woff)$ {
+    add_header Access-Control-Allow-Origin *;
+  }
 
   location @proxy_to_lms_app {
     proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;