diff --git a/DEPLOYMENT b/DEPLOYMENT
index ccfee9a1e..29cef95cb 100644
--- a/DEPLOYMENT
+++ b/DEPLOYMENT
@@ -7,10 +7,9 @@
         proxy_buffer_size   32k;
         proxy_buffers   6 32k;
 
-  * fix bad links to image assets with Nginx. `etc/nginx/sites-enabled/default`: 
+  * Make sure the static assets are served with caching headers. `etc/nginx/sites-enabled/default`: 
 
-        # Kete tends to generate incorrect links to images: fix this.
-        rewrite ^/image_files/(.*)$ /system/image_files/$1;
+        location ~ ^/(system|assets|image_files|audio|video|documents)/  {
 
   * Look for info that needs updating in `app/models/system_setting.rb`, especially server names, URLs and email addresses.
 
diff --git a/config/deploy.rb b/config/deploy.rb
index 5fcf3d5c2..14aa8a9fb 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -28,7 +28,7 @@
 set :linked_files, %w{config/database.yml config/secrets.yml config/initializers/secret_token.rb}
 
 # Default value for linked_dirs is []
-set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/uploads}
+set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/audio public/documents public/image_files public/video public/system public/uploads}
 
 
 # Default value for default_env is {}