diff --git a/arch-config/scripts/arch-config.sh b/arch-config/scripts/arch-config.sh
index c3c13de6..ebffea7d 100755
--- a/arch-config/scripts/arch-config.sh
+++ b/arch-config/scripts/arch-config.sh
@@ -406,6 +406,13 @@ cat <<EOF
 ########################################
 EOF
 
+# automatically add ssh keys to agent
+if [[ grep -L "AddKeysToAgent yes" "$HOME/.ssh/config" ]]; then
+    sed -i '' '1i\
+    AddKeysToAgent yes
+    ' "$HOME/.ssh/config"
+fi
+
 # set permissions for sudoers.d to root only
 sudo chown root:root -R /etc/sudoers.d/
 sudo chmod 600 -R /etc/sudoers.d/