diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
new file mode 100644
index 0000000..d64f17c
--- /dev/null
+++ b/app-crypt/acme-tiny/Manifest
@@ -0,0 +1,2 @@
+DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
+EBUILD acme-tiny-4.0.4-r1.ebuild 1194 BLAKE2B 271e586c7b9e897f3abf070ac0d7007832888c6614bb4d3af8bbd8673258f712ea1a6336e0a835e77e5446f06804895ad3557db95b6965a588d737c2afd74b15 SHA512 723616a5f37537146ed42e78599fedff6e40bf059c827e77110c565853c176bbe658d5e01d7b1468708d7279d1b9b1e43db5cf3f551c7373c6ca41fe6d05a2dc
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.4-r1.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.4-r1.ebuild
new file mode 100644
index 0000000..728a9b6
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+	KEYWORDS="amd64"
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="libressl"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="!libressl? ( dev-libs/openssl:0= )
+    libressl? ( dev-libs/libressl:0= )"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}