diff --git a/data/etc/apache2/sites-available/plinth-ssl.conf b/data/etc/apache2/sites-available/plinth-ssl.conf
index 93ad6b06f..0b8a9a627 100644
--- a/data/etc/apache2/sites-available/plinth-ssl.conf
+++ b/data/etc/apache2/sites-available/plinth-ssl.conf
@@ -6,11 +6,10 @@
 ##
 ## Requires the following Apache modules to be enabled:
 ##   mod_rewrite
-##   mod_gnutls
+##   mod_ssl or mod_gnutls
 ##
 <Location /plinth>
     RewriteEngine on
-    # FIXME: Workaround for mod_gnutls (Debian Bug #514005)
-    RewriteCond %{SERVER_PORT} !^443$
+    ReWriteCond %{HTTPS} !=on
     RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </Location>