diff --git a/apk/certbot/APKBUILD b/apk/certbot/APKBUILD
new file mode 100644
index 0000000..f3edbd1
--- /dev/null
+++ b/apk/certbot/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=certbot
+pkgver=0.26.1
+pkgrel=0
+pkgdesc="An ACME client that can update Apache/Nginx configurations"
+url="https://github.com/certbot/certbot"
+arch="noarch"
+license="Apache"
+depends="py-setuptools py-mock py-acme py-configargparse py-configobj
+	py-cryptography py-parsedatetime py-dialog py-openssl
+	py-rfc3339 py-tz py-requests py-six py-zope-component py-zope-interface
+	py-zope-event py-cffi py-enum34 py-ipaddress py-idna py-argparse py-packaging
+	py-certifi py-chardet py-future py-urllib3 py-josepy py-requests-toolbelt"
+# define acme deps here and add them to makedepends
+# so they get pulled in when bootstrapping.
+_depends_acme="py-setuptools py-cryptography py-ndg_httpsclient py-asn1 py-openssl
+	py-tz py-rfc3339 py-requests py-six py-werkzeug"
+replaces="letsencrypt"
+makedepends="$depends_dev $_depends_acme"
+subpackages="py-acme:acme"
+source="certbot-$pkgver.tar.gz::https://github.com/certbot/certbot/archive/v$pkgver.tar.gz"
+builddir="$srcdir"/$pkgname-$pkgver
+
+check() {
+	cd "$builddir"
+	python2 setup.py check
+}
+
+build() {
+	cd "$builddir"
+	python2 setup.py build
+}
+
+package() {
+	cd "$builddir"
+	python2 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+acme() {
+	pkgdesc="ACME protocol implementation for Python"
+	depends="$_depends_acme"
+	cd "$builddir"/acme
+	python2 setup.py build
+	python2 setup.py install --prefix=/usr --root="$subpkgdir"
+}
+
+sha512sums="e1eaca840f020135ad329c458b25f69b622de0e886c69fe64f098a6ea468e74e69e16625c5ea5c9465d220b1de01e40a45450dc5e2aded1c474508f65863396a  certbot-0.26.1.tar.gz"
+
diff --git a/apk/certbot/letsencrypt-wrapper b/apk/certbot/letsencrypt-wrapper
new file mode 100644
index 0000000..ef70a96
--- /dev/null
+++ b/apk/certbot/letsencrypt-wrapper
@@ -0,0 +1,6 @@
+#!/bin/sh
+echo >&2
+echo "Warning: letsencrypt has been renamed in certbot." >&2
+echo "From the next version, this wrapper will be removed." >&2
+echo >&2
+/usr/bin/certbot $@
diff --git a/apk/py-idna-2.6/APKBUILD b/apk/py-idna-2.6/APKBUILD
deleted file mode 100644
index 777b40e..0000000
--- a/apk/py-idna-2.6/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=py-idna-2.6
-_pkgname=idna
-pkgver=2.6
-pkgrel=0
-pkgdesc="IDNA 2008 and UTS #46 for Python"
-url="https://github.com/kjd/idna"
-arch="noarch"
-license="BSD"
-depends=""
-makedepends="python2-dev python3-dev py-setuptools"
-subpackages="py3-${pkgname#py-}:_py3 py2-${pkgname#py-}:_py2"
-source="idna-$pkgver.tar.gz::https://github.com/kjd/idna/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	python2 setup.py build || return 1
-	python3 setup.py build || return 1
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-_py() {
-	local python="$1"
-	pkgdesc="$pkgdesc (for $python)"
-	depends="$depends $python"
-	install_if="$pkgname=$pkgver-r$pkgrel $python"
-
-	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
-}
-
-_py2() {
-	replaces="$pkgname"
-	_py python2
-}
-
-_py3() {
-	_py python3
-}
-
-sha512sums="a621ae106aef65b4ca2dff7939891c52c73a5ab7708fb087a5b0738649dab3548fc92453ecf8a40e3f7e11921a27bac130fb4594fc2c6a31f38446501805da9b  idna-2.6.tar.gz"
-