diff --git a/.htaccess b/.htaccess
index 9da74f57f..77ad71eea 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,3 +14,7 @@
     # RewriteCond %{HTTPS} !=on 
     # RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 </IfModule>
+
+<IfModule pagespeed_module>
+    ModPagespeed Off
+</IfModule>
diff --git a/ChangeLog b/ChangeLog
index cf6d72092..1a42aab8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ Improvements:
 * Handle username with dots in user mentions
 * Replace Chosen jQuery plugin by custom UI component
 * Rewrite UI component that change user/group roles
+* Disable PageSpeed module from .htaccess if present
 
 Bug fixes: