diff --git a/.ssh/config b/.ssh/config
index b3b30c1..4fd98dc 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,47 +1,65 @@
-Host phil lil tommy
+# Servers.
+Host amy amy.opensourcerers.net
   ForwardAgent			yes
-  ForwardX11Trusted		yes
+  HostName			amy.opensourcerers.net
+  Port				9922
 
-Host bender bender.open-source.co.uk
+Host backup backup.slackware.uk
+  ForwardAgent			yes
+  Hostname			backup.slackware.uk
+  Port				9922
+
+Host bender bender.opensourcerers.net
+  ForwardAgent			yes
+  HostName			bender.opensourcerers.net
+  Port				9922
+
+Host fry fry.opensourcerers.net
+  ForwardAgent			yes
+  HostName			fry.opensourcerers.net
+  Port				9922
+
+Host kif kif.opensourcerers.net
+  ForwardAgent			yes
+  HostName			kif.opensourcerers.net
+  Port				9922
+
+Host leela leela.opensourcerers.net
+  ForwardAgent			yes
+  HostName			leela.opensourcerers.net
+  Port				9922
+
+Host oldbender
   ForwardAgent			yes
   HostName			bender.open-source.co.uk
   Port				9922
 
-Host fry fry.open-source.co.uk
+Host seedbox seedbox.slackware.uk
   ForwardAgent			yes
-  HostName			fry.open-source.co.uk
+  Hostname			seedbox.slackware.uk
   Port				9922
 
-Host leela leela.open-source.co.uk
+Host mirror mirror.slackware.uk
   ForwardAgent			yes
-  HostName			leela.open-source.co.uk
+  Hostname			mirror.slackware.uk
   Port				9922
 
-Host amy amy.open-source.co.uk
+Host zapp zapp.opensourcerers.net
   ForwardAgent			yes
-  HostName			amy.open-source.co.uk
+  HostName			zapp.opensourcerers.net
   Port				9922
 
-Host kif kif.open-source.co.uk
-  ForwardAgent			yes
-  HostName			kif.open-source.co.uk
-  Port				9922
-
-Host hermes hermes.open-source.co.uk
-  ForwardAgent			yes
-  HostName			hermes.open-source.co.uk
-  Port				9922
-
-Host slackware.uk
-  ForwardAgent			yes
-  Hostname			slackware.uk
-  Port				9922
 
+# Home stuff.
 Host afterdark.org.uk
   ForwardAgent			yes
   Hostname			afterdark.org.uk
   Port				6722
 
+Host phil lil tommy
+  ForwardAgent			yes
+  ForwardX11Trusted		yes
+
 Host full-* build-* clone-*
   ForwardAgent			yes
   User				root
@@ -51,6 +69,8 @@ Host backupnas
   Hostname			helium.rainsbrook.co.uk
   Port				2048
 
+
+# General settings.
 Host *
   # AddKeysToAgent		yes
   ConnectTimeout		30