diff --git a/src/source/build-numbers.md b/src/source/build-numbers.md
index 427db60..72e5dc7 100644
--- a/src/source/build-numbers.md
+++ b/src/source/build-numbers.md
@@ -36,10 +36,10 @@
 Eclair         | 2.1 (incl. 2.1-update 1) | API level 7, NDK 3
 Froyo          | 2.2.x        | API level 8, NDK 4
 Gingerbread    | 2.3 - 2.3.2  | API level 9, NDK 5
-Gingerbread    | 2.3.3 - 2.3.5            | API level 10
+Gingerbread    | 2.3.3 - 2.3.7            | API level 10
 Honeycomb      | 3.0                      | API level 11
 Honeycomb      | 3.1                      | API level 12
-Honeycomb      | 3.2                      | API level 13
+Honeycomb      | 3.2 - 3.2.1              | API level 13
 
 Starting with Cupcake, individual builds are identified with a short
 build code, e.g. FRF85B.
@@ -96,7 +96,10 @@
 GRI54  | android-2.3.3_r1.1 | Nexus S
 GRJ06D | android-2.3.4_r0.9 | Nexus S 4G
 GRJ22  | android-2.3.4_r1   | Nexus One, Nexus S, Nexus S 4G
-GRJ90  | android-2.3.5_r1   | latest Gingerbread version, Nexus S 4G
+GRJ90  | android-2.3.5_r1   | Nexus S 4G
+GRK39C |                    | Nexus S
+GRK39F |                    | Nexus One, Nexus S
+GWK74  |                    | latest Gingerbread version, Nexus S 4G
 
 The branches donut, eclair, froyo, gingerbread represent development
 branches that do not exactly match configurations that were tested
@@ -117,7 +120,9 @@
 HWI69  | android-3.0_r1.2
 HRI93  | android-3.0_r1.3
 HMJ37  | android-3.1_r1
-HTJ85B | android-3.2_r1     | latest Honeycomb version
+HTJ85B | android-3.2_r1
+HTK55D |
+HTK75D |                    | 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 8b1dae7..62023d2 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -163,6 +163,7 @@
 2.3.3 (GRI40)   | I9020XXKA3           | I9020XXKB1      | All previous versions
 2.3.4 (GRJ22)   | I9020XXKA3           | I9020XXKD1      | All previous versions
 2.3.5 (GRJ90)   | I9020XXKA3           | I9020XXKF1      | All previous versions
+2.3.6 (GRK39F)  | I9020XXKA3           | I9020XXKF1      | All previous versions
 
 Nexus S (850MHz version "UC"):
 
@@ -171,6 +172,8 @@
 2.3.3 (GRI54)   | I9020XXKA3           | I9020UCKB2
 2.3.4 (GRJ22)   | I9020XXKA3           | I9020UCKD1      | All previous versions
 2.3.5 (GRJ90)   | I9020XXKA3           | I9020UCKF1      | All previous versions
+2.3.6 (GRK39C)  | I9020XXKA3           | I9020UCKF1      | All previous versions
+2.3.6 (GRK39F)  | I9020XXKA3           | I9020UCKF1      | All previous versions
 
 Nexus S (Korea version "KR"):
 
@@ -179,6 +182,7 @@
 2.3.3 (GRI54)   | I9020XXKA3           | I9020KRKB3
 2.3.4 (GRJ22)   | I9020XXKA3           | M200KRKC1       | All previous versions
 2.3.5 (GRJ90)   | I9020XXKA3           | M200KRKC1       | All previous versions
+2.3.6 (GRK39F)  | I9020XXKA3           | M200KRKC1       | All previous versions
 
 Nexus S 4G:
 
@@ -187,9 +191,15 @@
 2.3.4 (GRJ06D)  | D720SPRKC5           | D720SPRKC9
 2.3.4 (GRJ22)   | D720SPRKC5           | D720SPRKD8      | All previous versions
 2.3.5 (GRJ90)   | D720SPRKC5           | D720SPRKE5      | All previous versions
+2.3.7 (GWK74)   | D720SPRKE1           | D720SPRKH1 (*)  | All previous versions
 
 If you're building a new version of Android, if your Nexus S or Nexus S 4G has
 an older bootloader and radio image that is marked as being also possible in
 the table above but is not recognized by fastboot, you can locally
 delete the `version-bootloader` and `version-baseband` lines in
 `device/samsung/crespo/board-info.txt` or `device/samsung/crespo4g/board-info.txt`.
+
+(*) As a note, radio version D720SPRKH1 for Nexus S 4G sometimes erroneously
+reports version D720SPRKE1. If this is the case for your Nexus S 4G, you can
+locally modify the version-baseband line in
+`device/samsung/crespo4g/board-info.txt` accordingly.