diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index 7921d91bd..1762ebac3 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -9,6 +9,13 @@ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
     AllowOverride None
     Order deny,allow
     Allow from all
+
+    # Explicitly allow caching of static content to avoid browser specific behavior.
+    # A resource's URL MUST change in order to have the client load the new version.
+    <IfModule expires_module>
+      ExpiresActive On
+      ExpiresDefault "access plus 1 year"
+    </IfModule>
 </Directory>
 
 <LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*\.(jpg|png|gif|css|js)">
@@ -64,4 +71,4 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 # The remote address will appear in SOGo's log files and in the X-Forward
 # header of emails.
 RewriteEngine On
-RewriteRule ^/SOGo/(.*)$ /SOGo/$1 [env=REMOTE_HOST:%{REMOTE_ADDR},PT]
\ No newline at end of file
+RewriteRule ^/SOGo/(.*)$ /SOGo/$1 [env=REMOTE_HOST:%{REMOTE_ADDR},PT]
diff --git a/ChangeLog b/ChangeLog
index eef787de6..0ff1eb63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-24  Jean Raby  <jraby@inverse.ca>
+
+	* Apache/SOGo.conf:
+	Use mod_expires to allow long term caching of static content. (1 year)
+	Note that from now on, a resource's URL _must_ change to let the client
+	reload it.  This is now done automatically for 'rsrc' in the wox templates,
+	but must be done manually for files referenced from css and js.
+
 2012-05-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/generic.js