diff --git a/h5bp/location/expires.conf b/h5bp/location/expires.conf
index 459dfd2..0033bd3 100644
--- a/h5bp/location/expires.conf
+++ b/h5bp/location/expires.conf
@@ -10,12 +10,12 @@
 
 # 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
@@ -26,13 +26,13 @@ location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
 
 # 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;
 # }