diff --git a/src/pkg/net/hosts.go b/src/pkg/net/hosts.go
index 5596c9dc72a..25af7968dbb 100644
--- a/src/pkg/net/hosts.go
+++ b/src/pkg/net/hosts.go
@@ -40,9 +40,11 @@ func readHosts() {
 			if len(f) < 2 || ParseIP(f[0]) == nil {
 				continue
 			}
-			h := f[1]
-			old, _ := hs[h]
-			hs[h] = appendHost(old, f[0])
+			for i := 1; i < len(f); i++ {
+				h := f[i]
+				old, _ := hs[h]
+				hs[h] = appendHost(old, f[0])
+			}
 		}
 		// Update the data cache.
 		hosts.time, _, _ = os.Time()
diff --git a/src/pkg/net/hosts_test.go b/src/pkg/net/hosts_test.go
index a05ee10e7ce..d0ee2a7acbd 100644
--- a/src/pkg/net/hosts_test.go
+++ b/src/pkg/net/hosts_test.go
@@ -24,6 +24,12 @@ var hosttests = []hostTest{
 		IPv4(127, 1, 1, 1),
 	}},
 	hostTest{"loki", []IP{}},
+	hostTest{"ullr", []IP{
+		IPv4(127, 1, 1, 2),
+	}},
+	hostTest{"ullrhost", []IP{
+		IPv4(127, 1, 1, 2),
+	}},
 }
 
 func TestLookupStaticHost(t *testing.T) {
diff --git a/src/pkg/net/hosts_testdata b/src/pkg/net/hosts_testdata
index 7cf6fbbc790..b601763898b 100644
--- a/src/pkg/net/hosts_testdata
+++ b/src/pkg/net/hosts_testdata
@@ -3,6 +3,8 @@
 127.0.0.3	odin  # inline comment 
 ::2             odin
 127.1.1.1	thor
+# aliases
+127.1.1.2	ullr ullrhost
 # Bogus entries that must be ignored.
 123.123.123	loki
 321.321.321.321