diff --git a/acct-group/drone/ChangeLog b/acct-group/drone/ChangeLog
new file mode 100644
index 0000000..e0a5a1f
--- /dev/null
+++ b/acct-group/drone/ChangeLog
@@ -0,0 +1,5 @@
+*drone-0 (25 Sep 2020)
+
+  25 Sep 2020; Manuel Friedli <manuel@gentoo.org> +drone-0.ebuild,
+  +metadata.xml:
+  acct-group/drone: Initial add.
diff --git a/acct-group/drone/Manifest b/acct-group/drone/Manifest
new file mode 100644
index 0000000..181fd90
--- /dev/null
+++ b/acct-group/drone/Manifest
@@ -0,0 +1,3 @@
+EBUILD drone-0.ebuild 301 BLAKE2B 9571ff2b20a655257569581d8329f2942c1c2cbc802634fa3255c38a5f09d1e82fa524f5b626c5de255aa9e6f976797b28939377f7c82a25698d40608fa8f536 SHA512 83cbb3c5f05371cd645de6cea8fca8ee025e3d3151dc61c8f910a1613366643eef2c62f5357df270de07dff25633bb562551b4007ee614ecc59a81668154d0ff
+MISC ChangeLog 141 BLAKE2B a1460a3143fdf136421095721368fb5cabb5752cc62c2d4cd6289ad5399e1a43924a3f1452dc552e17091fe08482b93e3d936cd464ef9261975fbc337988e241 SHA512 ab98506c50001389e31c51e24984e21a1f69863f1a63f0930a652cc8eff948e2032466a7eff4f75e7c278122015ac2c615ddbe9871a422312c63bdea4ad91c09
+MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
diff --git a/acct-group/drone/drone-0.ebuild b/acct-group/drone/drone-0.ebuild
new file mode 100644
index 0000000..590b4d6
--- /dev/null
+++ b/acct-group/drone/drone-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+DESCRIPTION="Group used for the drone.io build server"
+KEYWORDS="~amd64"
+
+# If you want this to persist across multiple machines, pick a real number!
+ACCT_GROUP_ID="-1"
diff --git a/acct-group/drone/metadata.xml b/acct-group/drone/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/acct-group/drone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/drone/ChangeLog b/acct-user/drone/ChangeLog
new file mode 100644
index 0000000..ecc3a59
--- /dev/null
+++ b/acct-user/drone/ChangeLog
@@ -0,0 +1,5 @@
+*drone-0 (25 Sep 2020)
+
+  25 Sep 2020; Manuel Friedli <manuel@gentoo.org> +drone-0.ebuild,
+  +metadata.xml:
+  acct-user/drone: Initial add.
diff --git a/acct-user/drone/Manifest b/acct-user/drone/Manifest
new file mode 100644
index 0000000..d7b2eab
--- /dev/null
+++ b/acct-user/drone/Manifest
@@ -0,0 +1,3 @@
+EBUILD drone-0.ebuild 319 BLAKE2B c436c525054295e2415993d7a92cf2f8f301b196584538f044c2b4230f16bc040d59854ce44e7e8cd9e6de551f95f7a9807adbf212530b31c204cf790fc5c4c2 SHA512 ff52d8f15df7f8af731c732413e806352bd2605d1f3dc8f5b63960622695d7dd32c299e87ce9fe6919e0f6f73db6199af45862e852a3ae715deb9a1fd2334988
+MISC ChangeLog 140 BLAKE2B 20bbbd57506386d62ae730ffe7ddd528376bb71852b4e51717f6733beeb4fdbb22704c1a6eb90e144037d52339b96c0fb205dc6fca4971d7f675b27d0a0ec558 SHA512 6b65cc921d0ee3a91c6ba337b9b67aad61785854d8d306df51f155807c577e9fbcb0dd2747f8e54e9822177426d95998e003aab15e6ada3a77ac1d05038123a8
+MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
diff --git a/acct-user/drone/drone-0.ebuild b/acct-user/drone/drone-0.ebuild
new file mode 100644
index 0000000..703d969
--- /dev/null
+++ b/acct-user/drone/drone-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the drone.io build server"
+KEYWORDS="~amd64"
+
+ACCT_USER_ID=-1
+# drone goes first, to make it the primary group
+ACCT_USER_GROUPS=( drone docker )
+
+acct-user_add_deps
diff --git a/acct-user/drone/metadata.xml b/acct-user/drone/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/acct-user/drone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>