diff --git a/apache/files/redirect.conf b/apache/files/redirect.conf
index 872ddb1..4cb983b 100644
--- a/apache/files/redirect.conf
+++ b/apache/files/redirect.conf
@@ -1,8 +1,12 @@
 {%- set site = salt['pillar.get']('apache:server:site:'+site_name) %}
-<VirtualHost *:80>
+<VirtualHost *:{% if site.host.port is defined %}{{ site.host.port }}{% else %}{% if site.ssl is defined %}443{% else %}80{% endif %}{% endif %}>
   {%- include "apache/files/_name.conf %}
-  {%- if site.host.admin is defined %}
-  ServerAdmin {{ site.host.admin }}
-  {%- endif %}
+  {%- include "apache/files/_ssl.conf" %}
+
+  {%- site.redirect_mode == 'rewrite' %}
+  RewriteEngine On
+  RewriteRule ^/?(.*) {{ site.target_url }}/$1 [R,L]
+  {%- else %}
   Redirect permanent / {{ site.target_url }}
+  {%- endif %}
 </VirtualHost>