diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index ca8e7c542..a0a20bc6a 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -4,3 +4,5 @@ DIST caddy-2.11.2-ffb6ab0.tar.gz 804370 BLAKE2B 978a3b0ec4492da4abbcdfa792ee3442
 DIST caddy-2.11.2-mark-go-bundle-ffb6ab0.tar.xz 186854060 BLAKE2B 7b21df78167c17142ddc63c40cd0fd52d45b6a78d572c6843fd16ac318a9e7260f372f44195a84ce7e8d829d5cf20d058c0af27191f071087bed97311b407604 SHA512 30a3d694487d4b1aeb379d75ea89c7a103bf798ea8d415f4cfc3498dc9021b15f61dee919e0eb423bcd15c70b88e49442e1e0d8ba3ff0f167f112080a489b37d
 DIST caddy-2.11.3-cc58caa.tar.gz 834505 BLAKE2B 047a8124bfc8ae726fb5eaa21599d278bf204a14564c6b642b91a87cadb0fa924cc7cf4420b5c6d587694e4a57448b3149da2d117bad7f5edd79c5d02fa28e5c SHA512 8dde1f9051dc7b3017bca874b1dc7310a47ed0a3669221ab4c427b23c7ac6db7f5fe247868610f8f3b3b176d78a7e0353ea63961b1914727029c420b25854eb1
 DIST caddy-2.11.3-mark-go-bundle-cc58caa.tar.xz 187953072 BLAKE2B d56e30e2991aa11327d2d1030c8b27b81b434bd6fa5eae7b5f100ae7a919102c5bb205fd590b54a6bcae3eab6de552a5635be78595c5d1f8ab939fae80232604 SHA512 88307aaeae88decbd1da6b4b5b82af8102dc6aa9a586f00e613b909b2a6c3aa713b67a1bf6d1585867454c879e81924ba132e9a67f4e18132b554ae6630363b7
+DIST caddy-2.11.4-e2eee6a.tar.gz 844021 BLAKE2B 3a7f5db72019a34ce0c6c431cb757ba326fd680ae79aedea4de48a2bd26e04cc8b3403c63d50c38abc2b2ea0daa31f0fe546c3c9ee8d4e269f570135d059962f SHA512 eac2a0376db995f5623b38fa5c042055cb590bb7fc9e44bfa38219a5af124c628aed04eb2e0ca63c4982c5e325f66e450387dc997202a4a226185e061ab2ca44
+DIST caddy-2.11.4-mark-go-bundle-e2eee6a.tar.xz 188630584 BLAKE2B f3ba761ca7e8c740131c9eb3a5bffaad76a1cbdf7b97a9091bc94e25881b81e82589dc9e170e8eb3bcb59ff82a32a3b639f36e9d7ba6fc2ff533b9fa79e59936 SHA512 532a50912e1dd200f72726a7ac2f41562ff15e2d570a9a96780144e35e4886e664b3b4768bab73dc86ff88940dde59c807f036e44fd5e93909dc4b1e77738f5b
diff --git a/www-servers/caddy/caddy-2.11.4.ebuild b/www-servers/caddy/caddy-2.11.4.ebuild
new file mode 100644
index 000000000..34dea9f7b
--- /dev/null
+++ b/www-servers/caddy/caddy-2.11.4.ebuild
@@ -0,0 +1,55 @@
+# Distributed under the terms of the GNU General Public License v2
+# Autogen by MARK Devkit
+
+EAPI=7
+inherit fcaps go-module user
+
+DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+SRC_URI="
+https://api.github.com/repos/caddyserver/caddy/tarball/v2.11.4 -> caddy-2.11.4-e2eee6a.tar.gz
+mirror://macaroni/caddy-2.11.4-mark-go-bundle-e2eee6a.tar.xz -> caddy-2.11.4-mark-go-bundle-e2eee6a.tar.xz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+BDEPEND="dev-lang/go
+"
+
+post_src_unpack() {
+	mv caddyserver-caddy-* ${S}
+}
+
+
+CADDY_USER="${PN}"
+CADDY_HOME="/var/www/${CADDY_USER}"
+pkg_setup() {
+	enewgroup ${CADDY_USER}
+	enewuser ${CADDY_USER} -1 -1 "${CADDY_HOME}" ${CADDY_USER}
+}
+# Upstream reference to set custom compile time Caddy versions:
+# https://github.com/caddyserver/caddy/pull/5072/files
+src_compile() {
+	go build -ldflags '-X github.com/caddyserver/caddy/v2.CustomVersion=v2.11.4-e2eee6a-macaroni' \
+	-mod=mod ./cmd/caddy || die "compile failed"
+}
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+	insinto /etc/"${PN}"
+	doins "${FILESDIR}"/Caddyfile
+	newconfd "${FILESDIR}/${PN}".confd ${PN}
+	newinitd "${FILESDIR}/${PN}".initd ${PN}
+	keepdir /var/log/"${PN}"
+	keepdir /var/www/"${PN}"
+	fowners "${CADDY_USER}:${CADDY_USER}" /var/log/"${PN}"
+	fowners "${CADDY_USER}:${CADDY_USER}" /var/www/"${PN}"
+	fperms 0750 /var/log/"${PN}"
+	fperms 0750 /var/www/"${PN}"
+}
+pkg_postinst() {
+	fcaps cap_net_bind_service=eip /usr/bin/caddy
+}
+
+
+
+# vim: filetype=ebuild