diff --git a/src/source/build-numbers.md b/src/source/build-numbers.md
index 1e782b7..07011aa 100644
--- a/src/source/build-numbers.md
+++ b/src/source/build-numbers.md
@@ -111,7 +111,7 @@
 IML74K | android-4.0.3_r1   | Nexus S
 IML77  | android-4.0.3_r1.1 |
 IMM76  | android-4.0.4_r1   |
-IMM76D | android-4.0.4_r1.1 | Nexus S, latest IceCreamSandwich version
+IMM76D | android-4.0.4_r1.1 | Nexus S, Nexus S 4G, Galaxy Nexus, latest IceCreamSandwich version
 
 The branches froyo, gingerbread, ics-mr0, ics-mr1, represent development
 branches that do not exactly match configurations that were tested
@@ -137,7 +137,8 @@
 HTK75D | android-3.2.1_r2
 HLK75C | android-3.2.2_r1
 HLK75D | android-3.2.2_r2
-HLK75F | android-3.2.4_r1   | latest Honeycomb version
+HLK75F | android-3.2.4_r1
+HLK75H | android-3.2.6_r1   | latest Honeycomb version
 
 There is no manifest that contains exactly those. However, there
 are manifests that allow building those components. The following
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index a147b68..bbc0962 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -191,7 +191,7 @@
 However, no compatibility issues are expected when running newer systems
 with older bootloaders and radio images according to the following tables.
 
-Nexus S (worldwide version "XX"):
+Nexus S (worldwide version "XX", i9020t and i9023):
 
 Android Version | Preferred Bootloader | Preferred Radio | Also possible
 ----------------|----------------------|-----------------|--------------
@@ -205,7 +205,7 @@
 4.0.3 (IML74K)  | I9020XXKL1           | I9020XXKI1      | All previous versions
 4.0.4 (IMM76D)  | I9020XXKL1           | I9020XXKI1
 
-Nexus S (850MHz version "UC"):
+Nexus S (850MHz version "UC", i9020a):
 
 Android Version | Preferred Bootloader | Preferred Radio | Also possible
 ----------------|----------------------|-----------------|--------------
@@ -215,9 +215,9 @@
 2.3.6 (GRK39C)  | I9020XXKA3           | I9020UCKF1      | All previous versions
 2.3.6 (GRK39F)  | I9020XXKA3           | I9020UCKF1      | All previous versions
 4.0.3 (IML74K)  | I9020XXKL1           | I9020UCKF1      | All previous versions
-4.0.4 (IMM76D)  | I9020XXKL1           | I9020UCKJ1      | All previous versions
+4.0.4 (IMM76D)  | I9020XXKL1           | I9020UCKJ1
 
-Nexus S (Korea version "KR"):
+Nexus S (Korea version "KR", m200):
 
 Android Version | Preferred Bootloader | Preferred Radio | Also possible
 ----------------|----------------------|-----------------|--------------
@@ -226,7 +226,7 @@
 2.3.5 (GRJ90)   | I9020XXKA3           | M200KRKC1       | All previous versions
 2.3.6 (GRK39F)  | I9020XXKA3           | M200KRKC1       | All previous versions
 4.0.3 (IML74K)  | I9020XXKL1           | M200KRKC1       | All previous versions
-4.0.4 (IMM76D)  | I9020XXKL1           | M200KRKC1       | All previous versions
+4.0.4 (IMM76D)  | I9020XXKL1           | M200KRKC1       | Versions from 2.3.6
 
 Galaxy Nexus (GSM/HSPA+):
 
@@ -235,7 +235,7 @@
 4.0.1 (ITL41D)  | PRIMEKJ10            | I9250XXKK1
 4.0.2 (ICL53F)  | PRIMEKK15            | I9250XXKK6      | All previous versions
 4.0.3 (IML74K)  | PRIMEKL01            | I9250XXKK6      | All previous versions
-4.0.4 (IMM76D)  | PRIMEKL03            | I9250XXLA02     | Versions from 4.0.2
+4.0.4 (IMM76D)  | PRIMEKL03            | I9250XXLA02
 
 If you're building a new version of Android, if your Nexus S or
 Galaxy Nexus has