diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 2704e06..7715a1d 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -165,7 +165,21 @@ function ldconfigcache() {
 }
 
 function addusers() {
-    groupadd users
+    if ! cat /etc/group | grep users; then
+      groupadd users
+    fi
+    if ! cat /etc/group | grep wheel; then
+      groupadd wheel
+    fi
+    if ! cat /etc/group | grep audio; then
+      groupadd audio
+    fi
+    if ! cat /etc/group | grep video; then
+      groupadd video
+    fi
+    if ! cat /etc/group | grep optical; then
+      groupadd optical
+    fi
     useradd -m -g users -G wheel,audio,video,sys,optical -s /bin/bash $username
     passwd ${username} <<EOT
 ${userpass}
diff --git a/base_libre-xfce4-openrc.txt b/base_libre-xfce4-openrc.txt
index 269676b..cfa71ac 100644
--- a/base_libre-xfce4-openrc.txt
+++ b/base_libre-xfce4-openrc.txt
@@ -111,6 +111,7 @@ keyutils
 kmod
 kmod-openrc
 krb5
+ldns
 less
 lftp
 libaio
@@ -227,6 +228,8 @@ openconnect
 openrc
 openrc-init
 openresolv
+openssh
+openssh-openrc
 openssl
 openssl-1.0
 opensysusers