diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
new file mode 100644
index 0000000..c096e75
--- /dev/null
+++ b/app-crypt/certbot-apache/Manifest
@@ -0,0 +1,3 @@
+DIST certbot-apache-0.6.0.tar.gz 686826 SHA256 58eaa6be4ae90af07d682296e42dbac924b5602c51002445059596313e182a09 SHA512 966fdbff13ac9651ebb5fafae86a58a45538d57a43eb6d157358bbecef4286634bb61dd13b94e0ca5b006980a35cc5fe55b4a12efdeadc2530653d844516c926 WHIRLPOOL 0bd424395b9002a04f6c900b208aea758f74e9864d75f6aa87fc30573f046c63f9791aa8bcce0a5452831192d1579e9b52fda5ed77befd6e4f361dab976d6369
+EBUILD certbot-apache-0.6.0.ebuild 1051 SHA256 ead789957c63cb1d0951bca583256109f5deb55c52b58a9b3772afceb5a0f64b SHA512 ca49a904ed44ec950bea4c3864cb7f8e8c61d5a3d74111fe5be5a3f478a5a9a4c4f9d2beb7d216dfb86dfd05020236bce7c4e0c9f81c52a68316b88e152b8bbf WHIRLPOOL 5f21a34c264de958564ee199a6b819211339a0280b22b1447005d72b5a8f1f538af729180b20dadf6c49ffa98e841e0b568f3cd85e26da66d5a7f4c27de98134
+MISC metadata.xml 249 SHA256 115c610dd9584e34b88bae272abb3bc8d0088f9980406491ecb01d2ad470647e SHA512 17fba255d5a76a284ce046103fcc05c4c8a217d5fe3c2f2c0cf78fb2271c641256b2e1fb5d3dc6c09d5522a16e0759ac3d15d70e4e55b27b4f317247f39480ba WHIRLPOOL 6c83046dea413ce20248f3d8ba57174559154dec2901fff530051eddeeb970280b87e8ee0052312fce6f430139881392574e3f64b6b954135bb630ed8df1cc70
diff --git a/app-crypt/letsencrypt-apache/letsencrypt-apache-0.5.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.6.0.ebuild
similarity index 80%
rename from app-crypt/letsencrypt-apache/letsencrypt-apache-0.5.0.ebuild
rename to app-crypt/certbot-apache/certbot-apache-0.6.0.ebuild
index a875f12..bbcf675 100644
--- a/app-crypt/letsencrypt-apache/letsencrypt-apache-0.5.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.6.0.ebuild
@@ -5,11 +5,11 @@
 EAPI=5
 PYTHON_COMPAT=(python2_7)
 
-MY_PN="letsencrypt"
+MY_PN="certbot"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	inherit git-r3 distutils-r1
 	KEYWORDS=""
 else
@@ -19,13 +19,13 @@ else
 fi
 
 DESCRIPTION="Apache plugin for letsencrypt"
-HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-RDEPEND="app-crypt/letsencrypt[${PYTHON_USEDEP}]
+RDEPEND="app-crypt/certbot[${PYTHON_USEDEP}]
 	app-crypt/acme[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
diff --git a/app-crypt/letsencrypt-apache/metadata.xml b/app-crypt/certbot-apache/metadata.xml
similarity index 100%
rename from app-crypt/letsencrypt-apache/metadata.xml
rename to app-crypt/certbot-apache/metadata.xml
diff --git a/app-crypt/letsencrypt-apache/Manifest b/app-crypt/letsencrypt-apache/Manifest
deleted file mode 100644
index d0a9735..0000000
--- a/app-crypt/letsencrypt-apache/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST letsencrypt-apache-0.5.0.tar.gz 650853 SHA256 503535fa356c45b46a166ea84875bb1fd43e994afee1485bbc3b6849d46c5d43 SHA512 bffa5123a702c02d74c21453a5f5583055986132eb4ae58b72d066c1c5514a1b6832fc381490998c107fbfc1ac8cd403b19b9a1c87006db4e6081e686c2a2fd0 WHIRLPOOL cd72b3f5d6aa95fe983c16d2c71038777ec37a5fdd74a4b51b31cfb72e16e5868c9dc3ec701a30da80e7b99e9409a0fb183f4eba76c58a86434bae0a32dd8169
-EBUILD letsencrypt-apache-0.5.0.ebuild 1073 SHA256 4cc5babd749a2e6c7b77770a3563b254d98b6e62782a1e73fa184fa84de611ae SHA512 835f8e0abffa227960e0fb7e49d06c7ea0db8ef2fe4936df358e258b9e1ebfca98721038685165f764a057bab4ff35c67c7f5a6c80b482edca63cd88a2fef055 WHIRLPOOL 4b2156390df62b59fea5180036c6add21e7484426360f12efca838d46aabcecb260b6fa5ea70d2acb8a41eac5791bb8011316bf9bd9459ef3a80345cd6088747
-MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
new file mode 100644
index 0000000..587d467
--- /dev/null
+++ b/profiles/updates/2Q-2016
@@ -0,0 +1 @@
+move app-crypt/letsencrypt-apache app-crypt/certbot-apache