diff --git a/ssh/config b/ssh/config
index 356bf3f..383668a 100644
--- a/ssh/config
+++ b/ssh/config
@@ -1,5 +1,3 @@
-# Control master
 ControlPath ${XDG_RUNTIME_DIR}/ssh/control-%C
-
-# SSH agent
 AddKeysToAgent yes
+Include config.d/*
diff --git a/ssh/config.d/hosts.archlinux b/ssh/config.d/hosts.archlinux
new file mode 100644
index 0000000..ec88b61
--- /dev/null
+++ b/ssh/config.d/hosts.archlinux
@@ -0,0 +1,6 @@
+Host aur.archlinux.org
+    User aur
+
+Host aur
+    User aur
+    Hostname aur.archlinux.org