diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh
index bd25e7b..d8c56f2 100755
--- a/arch-graphical-install-auto.sh
+++ b/arch-graphical-install-auto.sh
@@ -119,7 +119,7 @@ function addusers() {
         useruid=$((${useruid} + 1))
     done
 
-    useradd -m -g users -G wheel,audio,input,power,storage,video,sys,optical,adm,lp,scanner,sddm,kvm,fuse,autologin,network,wireshark,docker,libvirt,libvirtdbus -s /bin/bash --uid ${useruid} ${user}
+    useradd -m -g users -G wheel,audio,input,power,storage,video,sys,optical,adm,lp,scanner,sddm,kvm,fuse,autologin,network,wireshark,docker,libvirt,libvirtdbus -s /usr/bin/zsh --uid ${useruid} ${user}
     echo "${user}:${userpass}" | chpasswd
     mkdir -p /home/${user}/
     userrechte
@@ -432,8 +432,8 @@ cp /opt/${repo}/scripts/addusers.sh /usr/bin/addusers
 chmod 755 /usr/bin/addusers
 
 # set default shell
-chsh -s /bin/bash root
-chsh -s /bin/bash ${user}
+chsh -s /usr/bin/zsh root
+chsh -s /usr/bin/zsh ${user}
 
 # aurinstaller
 cp /opt/${repo}/scripts/aurinstall.sh /usr/bin/aurinstaller
diff --git a/arch-install.sh b/arch-install.sh
index 9dbe004..9e667db 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -1570,6 +1570,7 @@ fi
 arch-chroot ${mountpoint} usermod -l "${user}" "user1"
 arch-chroot ${mountpoint} usermod -d /home/"${user}" -m "${user}"
 arch-chroot ${mountpoint} chfn -f "${name}" "${user}"
+arch-chroot ${mountpoint} chsh -s /usr/bin/zsh ${user}
 
 if ! [ "${fastinstall}" == "y" ]; then
     read -s -p "Please choose a passwort for you!!! " userpass
diff --git a/packages.txt b/packages.txt
index f9615e5..09d51de 100644
--- a/packages.txt
+++ b/packages.txt
@@ -2,6 +2,7 @@ dhcpcd nano vim vim-spell-de intel-ucode amd-ucode iwd lvm2
 btrfs-progs ntfs-3g exfatprogs
 arch-install-scripts squashfs-tools dosfstools libisoburn grub efibootmgr dosfstools gptfdisk cronie memtest86+
 acpid dbus avahi ntp fail2ban alsa-utils alsa-tools bash-completion
+zsh zsh-autosuggestions zsh-completions zsh-history-substring-search zsh-lovers
 pavucontrol pamixer wget
 mesa-utils egl-wayland wofi mako fuzzel bemenu-wayland wayvnc xdg-desktop-portal-wlr slurp grim jq
 remmina libvncserver spice-gtk freerdp gtk-vnc element-desktop trash-cli