diff --git a/templates/httpd-vhost.conf.mustache b/templates/httpd-vhost.conf.mustache
index bb33658..5da79e9 100644
--- a/templates/httpd-vhost.conf.mustache
+++ b/templates/httpd-vhost.conf.mustache
@@ -39,7 +39,8 @@
 	Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
 	RewriteRule "^/.well-known/acme-challenge/" - [L]
 	DocumentRoot "{{vars.apache_vhost.site.doc_root}}"
-	Redirect permanent / https://{{vars.apache_vhost.site.domain}}/
+#	Redirect permanent / https://{{vars.apache_vhost.site.domain}}/
+	RewriteRule ^(.*)$ https://{{vars.apache_vhost.site.domain}}$1 [R=301,L]
 </VirtualHost>
 <VirtualHost *:443>
 	ServerAdmin {{vars.apache_vhost.site.email}}
@@ -60,6 +61,9 @@
 	RewriteEngine On
 	Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
 	RewriteRule "^/.well-known/acme-challenge/" - [L]
+	<Location /.well-known/acme-challenge/ >
+	</Location>
+
 	{{{vars.apache_vhost.site.raw}}}
 </VirtualHost>
 {{/vars.apache_vhost.site.ssl}}