diff --git a/.htaccess b/.htaccess
index 81a53f9989..63d50a2b9d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -26,7 +26,7 @@
   </FilesMatch>
 
   # Let browsers cache WOFF files for a week
-  <FilesMatch "\.woff$">
+  <FilesMatch "\.woff2?$">
     Header set Cache-Control "max-age=604800"
   </FilesMatch>
 </IfModule>
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 7e235d03fd..0278191587 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -504,7 +504,7 @@ class Setup {
 			$content .= "\n  Options -MultiViews";
 			$content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
 			$content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$";
+			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg)$";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";