diff --git a/generate-hosts.py b/generate-hosts.py
index 6a09862..42d2dde 100755
--- a/generate-hosts.py
+++ b/generate-hosts.py
@@ -7,6 +7,8 @@ import dns.resolver
 
 exp = re.compile('([^\.]+)')
 
+hosts = []
+
 if __name__ == '__main__':
 
 
@@ -21,9 +23,14 @@ if __name__ == '__main__':
          continue
 
       try:
-         res = dns.resolver.query(host)
-         ip = socket.gethostbyname(str(res.qname))
+         if True:
+            res = dns.resolver.query(host)
+            ips = socket.getaddrinfo(str(res.qname), None)
 
-         print("{0}\t{1} {2}".format(ip, str(res.qname)[:-1], exp.match(host).group(0)))
+            for ip in ips:
+               entry = (ip[4][0], str(res.qname)[:-1], exp.match(host).group(0))
+               if not entry in hosts:
+                  print("{0:45} {1} {2}".format(ip[4][0], str(res.qname)[:-1], exp.match(host).group(0)))
+                  hosts.append(entry)
       except:
          sys.stderr.write('Failed to get IP for: {0}\n'.format(host))
diff --git a/hosts.in b/hosts.in
index b95e229..743aa9a 100644
--- a/hosts.in
+++ b/hosts.in
@@ -40,7 +40,6 @@ goto80
 
 # CSC - Syscom
 
-!129.97.134.5     hydrazine.csclub.uwaterloo.ca hydrazine
 auth1
 auth2
 ldap1
@@ -49,6 +48,9 @@ kdc1
 kdc2
 kadmin
 
+hydrazine
+electrons
+
 mail
 
 aspartame