diff --git a/acct-group/acme/Manifest b/acct-group/acme/Manifest
new file mode 100644
index 0000000..2616328
--- /dev/null
+++ b/acct-group/acme/Manifest
@@ -0,0 +1 @@
+EBUILD acme-0-r1.ebuild 192 BLAKE2B 9a7cec58fcb932bc04bab6856d01a2722cf5dabbf41bf6d1815bbf1bb838679211a7d1d619ad807cfd5ad1360a57347a2624d97059eb43030442687d1624f283 SHA512 a17d32d634308b485dac1f8e84d602c5b29f61fe8aed6356e2ba2e6f4d209b66e6be483182cf49436d04fd40fb1f1f8221074c4fd3e3913fff98dc7c374d6352
diff --git a/acct-group/acme/acme-0-r1.ebuild b/acct-group/acme/acme-0-r1.ebuild
new file mode 100644
index 0000000..375a282
--- /dev/null
+++ b/acct-group/acme/acme-0-r1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Acme-utils program group"
+ACCT_GROUP_ID=65001
diff --git a/acct-user/acme/Manifest b/acct-user/acme/Manifest
new file mode 100644
index 0000000..39e8088
--- /dev/null
+++ b/acct-user/acme/Manifest
@@ -0,0 +1 @@
+EBUILD acme-0-r1.ebuild 285 BLAKE2B c16efd6845ed2d0bd7b75011e75ee203aa53b76ecf852877eedc897a4e84eca28776f2b268fe46bcd5e5e6f6f503e085a100e77812af949ee6e5e76ece6c2647 SHA512 ae781314af24f90d3efbdcba69513b7bfdb945ceec3ea425d1bc88f7670f6cc6b7dcb56a12c1c3cebdfda5b1d71421c6e5c9145e18e0cf9bec743f0ccbee14fb
diff --git a/acct-user/acme/acme-0-r1.ebuild b/acct-user/acme/acme-0-r1.ebuild
new file mode 100644
index 0000000..89e8c0c
--- /dev/null
+++ b/acct-user/acme/acme-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Acme-utils program user"
+ACCT_USER_ID=65001
+ACCT_USER_HOME=/etc/acme
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( acme )
+acct-user_add_deps
diff --git a/app-admin/acme-utils/Manifest b/app-admin/acme-utils/Manifest
index 29d6d52..de0fa7d 100644
--- a/app-admin/acme-utils/Manifest
+++ b/app-admin/acme-utils/Manifest
@@ -1,2 +1,2 @@
 AUX apache-challenge.conf 323 BLAKE2B 30f1191efb6e05b6682a967f513b572153595083277526cac9af2b6958e2fbc6241576370a07725fbc8b65c372877c41df0f1c78d87331083797736b24f5b8bb SHA512 4c292d2a31d4b8e59a0dcba2bfc20258e5188bfb6dcffdc02703e916dd0f3ab6ccfb9f43553dd3184b9f68b90358c08c1c1256d2bb3c76c9117b0196a844ab4a
-EBUILD acme-utils-0.5.7.ebuild 3172 BLAKE2B 3f78921e8d4210ddaf17a102dd72a02770708cb6ae0bd71d424173b71d99a5e8d488ceaf8b963db65735b87831ca23e6d1d90ac5931263a24f849bd38d041755 SHA512 336b77dff8fdf0ac41b18bd23b90f144355beeaf5929bceabdac5afd98e2b2698eec470703cb5bc6349db292f47c791b70bd6d8d583a164af64c03f8cacd5c4d
+EBUILD acme-utils-0.5.7-r1.ebuild 3117 BLAKE2B 30f855214591775ffc3365f809fe8dc0501d680d2dacce140cb6c0785e71979cab5d6de754ec6b4af47b1c4074a6cbd046d3f98de1cf5d36c4c2d137d4d39a0c SHA512 bd995e2fdcd99d1ddf7bd3b11116b24edbee4e1061092c91d8f11f1eb2164ceb2b837ec3885fd8c38d917e215917966118dfce71bafb25e3343235d88fab075d
diff --git a/app-admin/acme-utils/acme-utils-0.5.7.ebuild b/app-admin/acme-utils/acme-utils-0.5.7-r1.ebuild
similarity index 95%
rename from app-admin/acme-utils/acme-utils-0.5.7.ebuild
rename to app-admin/acme-utils/acme-utils-0.5.7-r1.ebuild
index 1323589..5ef6f90 100644
--- a/app-admin/acme-utils/acme-utils-0.5.7.ebuild
+++ b/app-admin/acme-utils/acme-utils-0.5.7-r1.ebuild
@@ -2,7 +2,7 @@
 
 EAPI="7"
 
-inherit git-r3 autotools user
+inherit git-r3 autotools
 
 EGIT_CLONE_TYPE="shallow"
 EGIT_REPO_URI="https://github.com/stknob/acme-utils.git"
@@ -21,12 +21,9 @@ RDEPEND="
 	net-misc/wget
 	net-dns/bind-tools
 "
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup acme 65001
-	enewuser  acme 65001 -1 "/etc/acme" "acme"
-}
+DEPEND="${RDEPEND}
+	acct-group/acme
+	acct-user/acme"
 
 src_prepare() {
 	eapply_user