diff --git a/doc/common-problems.md b/doc/common-problems.md
index 8a06c31..20fa4f5 100644
--- a/doc/common-problems.md
+++ b/doc/common-problems.md
@@ -148,7 +148,6 @@ will be a 404. The reason for this is that H5bp's basic ruleset includes, for ex
 	location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
 		expires 1M;
 		access_log off;
-		add_header Cache-Control "public";
 	}
 
 Which will _also_ capture any dynamic requests matching that url pattern and not
@@ -166,7 +165,6 @@ Modifying (all) location blocks as follows:
 
 		expires 1M;
 		access_log off;
-		add_header Cache-Control "public";
 	}
 
 Will make Nginx pass requests for files that don't exist to the application.
diff --git a/h5bp/location/cross-domain-fonts.conf b/h5bp/location/cross-domain-fonts.conf
index b55ee6b..e0fa318 100644
--- a/h5bp/location/cross-domain-fonts.conf
+++ b/h5bp/location/cross-domain-fonts.conf
@@ -7,7 +7,6 @@ location ~* \.(?:ttf|ttc|otf|eot|woff|woff2)$ {
   # See http://wiki.nginx.org/HttpCoreModule#location
   # And https://github.com/h5bp/server-configs/issues/85
   # And https://github.com/h5bp/server-configs/issues/86
-  expires 1M;
   access_log off;
-  add_header Cache-Control "public";
+  add_header Cache-Control "max-age=2592000";
 }
diff --git a/h5bp/location/expires.conf b/h5bp/location/expires.conf
index a1be73e..0033bd3 100644
--- a/h5bp/location/expires.conf
+++ b/h5bp/location/expires.conf
@@ -10,30 +10,29 @@
 
 # cache.appcache, your document html and data
 location ~* \.(?:manifest|appcache|html?|xml|json)$ {
-  expires -1;
+  add_header Cache-Control "max-age=0";
 }
 
 # Feed
 location ~* \.(?:rss|atom)$ {
-  expires 1h;
+  add_header Cache-Control "max-age=3600";
 }
 
 # Media: images, icons, video, audio, HTC
 location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
-  expires 1M;
   access_log off;
-  add_header Cache-Control "public";
+  add_header Cache-Control "max-age=2592000";
 }
 
 # CSS and Javascript
 location ~* \.(?:css|js)$ {
-  expires 1y;
+  add_header Cache-Control "max-age=31536000";
   access_log off;
 }
 
 # WebFonts
 # If you are NOT using cross-domain-fonts.conf, uncomment the following directive
 # location ~* \.(?:ttf|ttc|otf|eot|woff|woff2)$ {
-#  expires 1M;
+#  add_header Cache-Control "max-age=2592000";
 #  access_log off;
 # }