diff --git a/acme-challenge.conf.in b/acme-challenge.conf.apache.in
similarity index 100%
rename from acme-challenge.conf.in
rename to acme-challenge.conf.apache.in
diff --git a/acme-challenge.in b/acme-challenge.conf.nginx.in
similarity index 100%
rename from acme-challenge.in
rename to acme-challenge.conf.nginx.in
diff --git a/dehydrated-0.3.1.tar.gz b/dehydrated-0.3.1.tar.gz
deleted file mode 100644
index 4013bc8..0000000
--- a/dehydrated-0.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c9b9475b442dd19dbc33a26426444054781e14a2f122d2a2405f81093484239
-size 71375
diff --git a/dehydrated-0.4.0.tar.gz b/dehydrated-0.4.0.tar.gz
new file mode 100644
index 0000000..ce815fd
--- /dev/null
+++ b/dehydrated-0.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:611da321330ffd43d1dc497990b486b2dec12c59149803ad7d156980c8527f48
+size 74005
diff --git a/dehydrated.changes b/dehydrated.changes
index 643c0f0..0c57fd0 100644
--- a/dehydrated.changes
+++ b/dehydrated.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Feb 18 16:51:10 UTC 2017 - daniel@molkentin.de
+
+- Unify configuration file source names 
+
+-------------------------------------------------------------------
+Sat Feb 18 14:08:02 UTC 2017 - daniel@molkentin.de
+
+- Bump to 0.4.0 
+
 -------------------------------------------------------------------
 Thu Feb  2 15:04:16 UTC 2017 - daniel.molkentin@suse.com
 
diff --git a/dehydrated.spec b/dehydrated.spec
index c1eb8a6..a1ea27c 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -46,15 +46,15 @@
 %{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d }
 
 Name:           dehydrated
-Version:        0.3.1
+Version:        0.4.0
 Release:        0
 Summary:        A client for signing certificates with an ACME server
 License:        MIT
 Group:          Productivity/Networking/Security
 Url:            https://github.com/lukas2511/dehydrated
 Source0:        %{name}-%{version}.tar.gz
-Source1:        acme-challenge.conf.in
-Source2:        acme-challenge.in
+Source1:        acme-challenge.conf.apache.in
+Source2:        acme-challenge.conf.nginx.in
 Source3:        acme-challenge.conf.lighttpd.in
 Source4:        dehydrated.cron.in
 Source5:        dehydrated.tmpfiles.d