diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group
index 1b645efe325..990f5ee6776 100644
--- a/srcpkgs/base-files/files/group
+++ b/srcpkgs/base-files/files/group
@@ -19,5 +19,8 @@ optical:x:17:
 mail:x:18:
 storage:x:19:
 scanner:x:20:
+network:x:21:
+dbus:x:22:
+avahi:x:23:
 nogroup:x:99:
 users:x:100:
diff --git a/srcpkgs/base-files/files/passwd b/srcpkgs/base-files/files/passwd
index 70903ef514c..13e213bc4d4 100644
--- a/srcpkgs/base-files/files/passwd
+++ b/srcpkgs/base-files/files/passwd
@@ -1,2 +1,4 @@
 root:x:0:0:root:/root:/bin/bash
+dbus:x:22:22:dbus unprivileged user:/dev/null:/sbin/nologin
+avahi:x:23:23:avahi unprivileged user:/dev/null:/sbin/nologin
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false