diff --git a/abuild.in b/abuild.in
index 20beae5..99d9cd0 100755
--- a/abuild.in
+++ b/abuild.in
@@ -385,8 +385,12 @@ mkusers() {
 	local i
 	for i in $pkgusers; do
 		if ! getent passwd $i >/dev/null; then
+			local gopt=
 			msg "Creating user $i"
-			$SUDO adduser -D -H $i || return 1
+			if getent group $i >/dev/null; then
+				gopt="-G $i"
+			fi
+			$SUDO adduser -D -H $gopt $i || return 1
 		fi
 	done
 	for i in $pkggroups; do