diff --git a/ssh/config b/ssh/config
index 8339252..fbc876b 100644
--- a/ssh/config
+++ b/ssh/config
@@ -1,9 +1,21 @@
-Host faui*
+Host 0?? 0???
+	HostName faui%h.informatik.uni-erlangen.de
+
+Host man? man?? big?
+	HostName faui49%h.informatik.uni-erlangen.de
+
+Host faui2hg
+	HostName faui2hg.informatik.uni-erlangen.de
+	User est_tpreisner
+
+Host faui* !faui2hg*
 	HostName %h.informatik.uni-erlangen.de
-	User ty28wuqu
 
 Host ircbox
-	HostName ircbox.informatik.uni-erlangen.de
+	HostName ircbox.cs.fau.de
+	User ty28wuqu
+
+Match Host faui*
 	User ty28wuqu
 
 Host irc