diff --git a/src/source/build-numbers.jd b/src/source/build-numbers.jd
index 46b8b06..fc84fc8 100644
--- a/src/source/build-numbers.jd
+++ b/src/source/build-numbers.jd
@@ -479,25 +479,31 @@
 
 <tr>
 <td>JWR66L</td>
-<td>android-4.3_w_r0.8</td>
+<td>android-4.3_r0.9</td>
 <td>Nexus 7</td>
 </tr>
 
 <tr>
 <td>JWR66N</td>
-<td>android-4.3_w_r0.9</td>
-<td>Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
+<td>android-4.3_r0.9.1</td>
+<td>Galaxy Nexus, Nexus 7 (grouper/tilapia/flo), Nexus 4, Nexus 10</td>
 </tr>
 
 <tr>
 <td>JWR66V</td>
-<td>android-4.3_w_r1</td>
+<td>android-4.3_r1</td>
 <td>Galaxy Nexus, Nexus 7 (grouper/tilapia), Nexus 4, Nexus 10</td>
 </tr>
 
 <tr>
+<td>JSR78D</td>
+<td>android-4.3_r2</td>
+<td>Nexus 7 (deb)</td>
+</tr>
+
+<tr>
 <td>JSS15J</td>
-<td>android-4.3_s_r1</td>
+<td>android-4.3_r2.1</td>
 <td>latest Jelly Bean version, Nexus 7 (flo/deb)</td>
 </tr>
 
diff --git a/src/source/building-devices.jd b/src/source/building-devices.jd
index 3b227a8..5428259 100644
--- a/src/source/building-devices.jd
+++ b/src/source/building-devices.jd
@@ -194,12 +194,12 @@
 <tbody>
 <tr>
 <td>flo</td>
-<td>android-4.3_s_r1 or master</td>
+<td>android-4.3_r2.1 or master</td>
 <td>aosp_flo-userdebug</td>
 </tr>
 <tr>
 <td>deb</td>
-<td>android-4.3_s_r1 or master</td>
+<td>android-4.3_r2.1 or master</td>
 <td>aosp_deb-userdebug</td>
 </tr>
 <tr>
@@ -209,27 +209,27 @@
 </tr>
 <tr>
 <td>mako</td>
-<td>android-4.3_w_r1 or master</td>
+<td>android-4.3_r1 or master</td>
 <td>aosp_mako-userdebug</td>
 </tr>
 <tr>
 <td>grouper</td>
-<td>android-4.3_w_r1 or master</td>
+<td>android-4.3_r1 or master</td>
 <td>aosp_grouper-userdebug</td>
 </tr>
 <tr>
 <td>tilapia</td>
-<td>android-4.3_w_r1 or master</td>
+<td>android-4.3_r1 or master</td>
 <td>aosp_tilapia-userdebug</td>
 </tr>
 <tr>
 <td>maguro</td>
-<td>android-4.3_w_r1 or master</td>
+<td>android-4.3_r1 or master</td>
 <td>aosp_maguro-userdebug</td>
 </tr>
 <tr>
 <td>toro</td>
-<td>android-4.3_w_r1 or master</td>
+<td>android-4.3_r1 or master</td>
 <td>aosp_toro-userdebug</td>
 </tr>
 <tr>