diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
new file mode 100644
index 0000000..8902271
--- /dev/null
+++ b/app-crypt/dehydrated/Manifest
@@ -0,0 +1,3 @@
+AUX config 3491 SHA256 66499ffb7e57d8911c9c34d57e2e12759d924f8e5b73fe2a51c9d327db0a9899 SHA512 68a30856e7bd843186eaac3a90051c3eaa2814b0990986a3153c5724f1b44b92953507ef5e455e727b4fd5c5e1aec557c8f341805abc9a69d12fa46620b020c1 WHIRLPOOL 43b94a00221ca6635b5dbc0cc80c3dd552c3b0293bd5469e6026d3a5084753cd22d08a24675ab406d0f5c12c6ef6e7c892be77094de8ae90ec39bacd85e0b080
+AUX nginx.conf 73 SHA256 9f94c681db9dd230b0a3969bddeb21b5f66f13a52c03c30541775cd54a1719bd SHA512 8c4d6339f7b0eb3ab87a43a52cbbd8041a83d546f6c2a153af701efc957d304431384a705ecd05dd0ddffb53ab879828ef50d04ff050ccec97685134a3c2b29b WHIRLPOOL 79c3779f653ce6243a5af5c3009798d68f7c2ff7844450e13631b9315d5d6af0b352e104bb999f6ce531e6ba1465ef76d89ff248a8a5fa715cac3f5b9bbaca2f
+EBUILD dehydrated-0.3.1.ebuild 883 SHA256 9735c00e5b199b3417256ad35e19c840ca7d51f2a03bae31d8467ca59107899d SHA512 b9c145b794ad4ceb93c100c2e252751cf19cb8d0f6c31e8ffb3f302a11bbf3797032656cbc0a582b569a192ae811cc1724300e9cea7fe87e4cb3adf18f6b0bc9 WHIRLPOOL f07706cee66eb9aa27479a07de62726ce081d874b148d7bfaae04af6a6da58a8563357f4f5f801d43c63dea67a5a924e3bdf95afd4c38eaf480d355f4d9f1b04
diff --git a/app-crypt/letsencrypt-sh/letsencrypt-sh-9999.ebuild b/app-crypt/dehydrated/dehydrated-0.3.1.ebuild
similarity index 65%
rename from app-crypt/letsencrypt-sh/letsencrypt-sh-9999.ebuild
rename to app-crypt/dehydrated/dehydrated-0.3.1.ebuild
index 4d30110..9a0cd7a 100644
--- a/app-crypt/letsencrypt-sh/letsencrypt-sh-9999.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.3.1.ebuild
@@ -7,8 +7,8 @@ EAPI=6
 inherit git-r3
 
 DESCRIPTION="Client for signing certificates with an ACME-server implemented as a relatively simple bash-script"
-HOMEPAGE="https://github.com/lukas2511/letsencrypt.sh"
-EGIT_REPO_URI="https://github.com/lukas2511/letsencrypt.sh.git"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+EGIT_REPO_URI="https://github.com/lukas2511/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -25,19 +25,19 @@ RDEPEND="
 DOCS=( README.md docs/. )
 
 src_install() {
-	dobin letsencrypt.sh
+	dobin ${PN}
 	docompress -x /usr/share/doc/${PF}/examples
 	default
 
-	ETCDIR=/etc/letsencrypt.sh
+	ETCDIR=/etc/${PN}
 	insinto ${ETCDIR}
 	doins ${FILESDIR}/config
-	touch ${D}${ETCDIR}/domains.txt
-	keepdir /etc/ssl/letsencrypt
-	keepdir /var/www/letsencrypt
+	touch ${D}${ETCDIR}/domains
+	keepdir /etc/ssl/${PN}
+	keepdir /var/www/${PN}
 	if use nginx ; then
 		mkdir -p ${D}/etc/nginx
-		cp ${FILESDIR}/nginx.conf  ${D}/etc/nginx/letsencrypt.conf
+		cp ${FILESDIR}/nginx.conf  ${D}/etc/nginx/${PN}.conf
     fi
 }
 
diff --git a/app-crypt/letsencrypt-sh/files/config b/app-crypt/dehydrated/files/config
similarity index 85%
rename from app-crypt/letsencrypt-sh/files/config
rename to app-crypt/dehydrated/files/config
index a307496..8f56a8b 100644
--- a/app-crypt/letsencrypt-sh/files/config
+++ b/app-crypt/dehydrated/files/config
@@ -1,21 +1,25 @@
 ########################################################
-# This is the main config file for letsencrypt.sh      #
+# This is the main config file for dehydrated          #
 #                                                      #
 # This file is looked for in the following locations:  #
 # $SCRIPTDIR/config (next to this script)              #
-# /usr/local/etc/letsencrypt.sh/config                 #
-# /etc/letsencrypt.sh/config                           #
+# /usr/local/etc/dehydrated/config                     #
+# /etc/dehydrated/config                               #
 # ${PWD}/config (in current working-directory)         #
 #                                                      #
 # Default values of this config are in comments        #
 ########################################################
 
+# Resolve names to addresses of IP version only. (curl)
+# supported values: 4, 6
+# default: <unset>
+#IP_VERSION=
+
 # Path to certificate authority (default: https://acme-v01.api.letsencrypt.org/directory)
 #CA="https://acme-v01.api.letsencrypt.org/directory"
-#CA="https://acme-staging.api.letsencrypt.org/directory"
 
-# Path to license agreement (default: https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf)
-#LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
+# Path to license agreement (default: https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf)
+#LICENSE="https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf"
 
 # Which challenge should be used? Currently http-01 and dns-01 are supported
 #CHALLENGETYPE="http-01"
@@ -31,6 +35,7 @@
 
 # File containing the list of domains to request certificates for (default: $BASEDIR/domains.txt)
 #DOMAINS_TXT="${BASEDIR}/domains.txt"
+DOMAINS_TXT="${BASEDIR}/domains"
 
 # Output directory for generated certificates
 #CERTDIR="${BASEDIR}/certs"
@@ -39,9 +44,8 @@ CERTDIR="/etc/ssl/letsencrypt"
 # Directory for account keys and registration information
 #ACCOUNTDIR="${BASEDIR}/accounts"
 
-# Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: $BASEDIR/.acme-challenges)
-#WELLKNOWN="${BASEDIR}/.acme-challenges"
-WELLKNOWN=/var/www/letsencrypt
+# Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)
+#WELLKNOWN="/var/www/dehydrated"
 
 # Default keysize for private keys (default: 4096)
 #KEYSIZE="4096"
@@ -75,11 +79,9 @@ WELLKNOWN=/var/www/letsencrypt
 
 # E-mail to use during the registration (default: <unset>)
 #CONTACT_EMAIL=
-CONTACT_EMAIL=""
 
 # Lockfile location, to prevent concurrent access (default: $BASEDIR/lock)
 #LOCKFILE="${BASEDIR}/lock"
 
 # Option to add CSR-flag indicating OCSP stapling to be mandatory (default: no)
 #OCSP_MUST_STAPLE="no"
-
diff --git a/app-crypt/letsencrypt-sh/files/nginx.conf b/app-crypt/dehydrated/files/nginx.conf
similarity index 56%
rename from app-crypt/letsencrypt-sh/files/nginx.conf
rename to app-crypt/dehydrated/files/nginx.conf
index 1038e99..daddccd 100644
--- a/app-crypt/letsencrypt-sh/files/nginx.conf
+++ b/app-crypt/dehydrated/files/nginx.conf
@@ -1,4 +1,4 @@
 location /.well-known/acme-challenge {
-    alias /var/www/letsencrypt;
+    alias /var/www/dehydrated;
 }
 
diff --git a/app-crypt/letsencrypt-sh/Manifest b/app-crypt/letsencrypt-sh/Manifest
deleted file mode 100644
index bfc594c..0000000
--- a/app-crypt/letsencrypt-sh/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX config 3462 SHA256 136b58603704228d958ffaf62029d7fc9b2eba2cf86c7eb01dc9f5e88191c523 SHA512 75b635b3b32169888474eb6d2dbe845bf8d1380229f2fb2ae34e5b83ee2aac4b48ee853b4d0bc4636d7a8c0b0f8f7da171aa93a315114afd455106f804b2b530 WHIRLPOOL 8bc1389915fd2ec17e253d5af16fbd933de757c21bcf409d6df737464db3da682a6514b56254bd002f8c943c0c00e1df96803d6f6bd1d29a41d53e02c5b2cefa
-AUX nginx.conf 74 SHA256 253a91301d18b47aa0934c3700da94b4c5f3a6125f2e713a2768d92cc3f00c84 SHA512 66149bb5e854af4dfada0d3446481071081fe4387771935c6bcf2be204d6d054209b0397e08093e767cb921de61b225c21be2f0ebe8b8eb0b7ce332fc63f08d2 WHIRLPOOL 8e32692a36c1a2bbdb86e8c087b9f9244ac84e9527f4659317bc2d3095a570d362b7a8dfc553facb423b7821bb569f0c2932ed5a2307def824c2b7598498761e
-EBUILD letsencrypt-sh-9999.ebuild 936 SHA256 7ba628d6ee2c47ac61b3a0d8876ac800c28d140643dfcacc42a3444c166d9146 SHA512 16329e9991fb9151bce97b6b7778ca8e354f91fd812c18cdda7dc223efd6b81fb3bc046c08990bd7686396356dc962d1aaeb7c41d883dd248628d77fc7eb6c9b WHIRLPOOL 29e5f2ac856dec03e5d0cc3ffcaa65e96e63aa13b9dc5030bf0b0723081577261d64a2645fc8c305c8a74e7ade9ac0d21a837f4f7f60b0c8bd948a90c2fa5b3a