diff --git a/roundcubemail-httpd.conf b/roundcubemail-httpd.conf
index 5dd0f13..d7a2376 100644
--- a/roundcubemail-httpd.conf
+++ b/roundcubemail-httpd.conf
@@ -108,6 +108,13 @@ AddType text/x-component .htc
         SetOutputFilter DEFLATE
     </IfModule>
 
+    # prefer to brotli over gzip if brotli is available
+    <IfModule mod_brotli.c>
+        SetOutputFilter BROTLI_COMPRESS
+        # some assets have been compressed, so no need to do it again
+        SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png|web[pm]|woff2?)$ no-brotli
+    </IfModule>
+
     <IfModule mod_filter.c>
 		AddOutputFilterByType DEFLATE application/javascript
 		AddOutputFilterByType DEFLATE application/x-javascript 
diff --git a/roundcubemail.changes b/roundcubemail.changes
index e588fa2..1dcfa0e 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 18 11:39:33 UTC 2020 - Lars Vogdt <lars@linux-schulserver.de>
+
+- prefer brotli over gzip if brotli is available:
+  + enable mod_brotli in roundcubemail-httpd.conf (after deflate)
+  + enable brotli via a2enmod for new installations
+
 -------------------------------------------------------------------
 Thu Jan  2 19:43:40 UTC 2020 - Lars Vogdt <lars@linux-schulserver.de>
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 57dbd67..1597852 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package roundcubemail
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -250,7 +250,7 @@ if [ ${1:-0} -eq 1 ]; then
       %{_sbindir}/a2enmod -q php7    || %{_sbindir}/a2enmod php7
     fi
   %endif
-    for module in alias deflate expires filter headers rewrite setenvif version ; do
+    for module in alias brotli deflate expires filter headers rewrite setenvif version ; do
       %{_sbindir}/a2enmod -q $module || %{_sbindir}/a2enmod $module
     done
   fi