diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index f0bd4723..00421360 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -263,10 +263,10 @@ fastcgi_param  REDIRECT_STATUS    200;
 ]]>
 						</content>
 					</file>
-					<file name="/etc/nginx/conf.d/acme.conf">
+					<file name="/etc/nginx/acme.conf">
 						<content><![CDATA[
 location /.well-known/acme-challenge {
-	alias {{settings.system.letsencryptchallengepath}};
+	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
 
 	location ~ /.well-known/acme-challenge/(.*) {
 		default_type text/plain;
diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml
index 35564d76..0d70716c 100644
--- a/lib/configfiles/jessie.xml
+++ b/lib/configfiles/jessie.xml
@@ -285,10 +285,10 @@ fastcgi_param  REDIRECT_STATUS    200;
 ]]>
 						</content>
 					</file>
-					<file name="/etc/nginx/conf.d/acme.conf">
+					<file name="/etc/nginx/acme.conf">
 						<content><![CDATA[
 location /.well-known/acme-challenge {
-	alias {{settings.system.letsencryptchallengepath}};
+	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
 
 	location ~ /.well-known/acme-challenge/(.*) {
 		default_type text/plain;
diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml
index ab7930ae..a8d15084 100644
--- a/lib/configfiles/precise.xml
+++ b/lib/configfiles/precise.xml
@@ -244,10 +244,10 @@ fastcgi_param  REDIRECT_STATUS    200;
 ]]>
 						</content>
 					</file>
-					<file name="/etc/nginx/conf.d/acme.conf">
+					<file name="/etc/nginx/acme.conf">
 						<content><![CDATA[
 location /.well-known/acme-challenge {
-	alias {{settings.system.letsencryptchallengepath}};
+	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
 
 	location ~ /.well-known/acme-challenge/(.*) {
 		default_type text/plain;
diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml
index 95af6869..54fb579d 100644
--- a/lib/configfiles/wheezy.xml
+++ b/lib/configfiles/wheezy.xml
@@ -313,10 +313,10 @@ fastcgi_param  REDIRECT_STATUS    200;
 ]]>
 						</content>
 					</file>
-					<file name="/etc/nginx/conf.d/acme.conf">
+					<file name="/etc/nginx/acme.conf">
 						<content><![CDATA[
 location /.well-known/acme-challenge {
-	alias {{settings.system.letsencryptchallengepath}};
+	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
 
 	location ~ /.well-known/acme-challenge/(.*) {
 		default_type text/plain;