--- wikisrc/amazon_ec2/amis.mdwn	2012/02/12 16:07:21	1.6
+++ wikisrc/amazon_ec2/amis.mdwn	2012/10/15 18:32:39	1.27
@@ -2,11 +2,14 @@
 
 The following AMIs are publicly available. You can use them to [[start a NetBSD instance|/amazon_ec2/netbsd_in_5_min/]] quickly.
 
-They come with [src](http://www.netbsd.org/docs/guide/en/chap-fetch.html) and [pkgsrc](http://www.netbsd.org/docs/pkgsrc/) bundled under */usr/src/* and */usr/pkgsrc/* respectively.
+They come with [src](http://www.netbsd.org/docs/guide/en/chap-fetch.html) and [pkgsrc](http://www.netbsd.org/docs/pkgsrc/) bundled under */usr/src/* and */usr/pkgsrc/* respectively, or a bootstrap script to help fetch them when necessary.  The bootstrap script can also be used to set up binary packages support using pkgin(1).
 
-## amd64 (x86_64) -- 64 bits AMIs
+Note: these AMIs send an email to the maintainer on first launch, to
+help gauge usage.  
+
+## amd64 (x86_64) -- 64 bit AMIs
 
-The following AMIs are for 64 bits instances.
+The following AMIs are for 64 bit instances.
 
 <table class="center">
 <tr>
@@ -20,31 +23,41 @@ The following AMIs are for 64 bits insta
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
+  <th>NetBSD 5.1.2</th><!-- Version -->
+  <td>ami-98904bf1</td><!-- us-east-1 -->
+  <td>ami-6d267d28</td><!-- us-west-1 -->
+  <td>ami-04f37f34</td><!-- us-west-2 -->
+  <td>ami-e93d069d</td><!-- eu-west-1 -->
+  <td>ami-caa9ee98</td><!-- ap-southeast-1 -->
+  <td>ami-10e25211</td><!-- ap-northeast-1 -->
+  <td>ami-5ca17f41</td><!-- sa-east-1 -->
+</tr>
+<tr>
   <th>NetBSD 5.1</th>
   <td>ami-2da67644</td>
   <td>ami-a7742de2</td>
   <td>ami-5c75f86c</td>
   <td>ami-9df0cee9</td>
-  <td>ami-a24501f0</td>
+  <td>ami-d2b9fe80</td>
   <td>ami-ac78cead</td>
   <td>ami-4e7ea153</td>
 </tr>
 <tr>
-  <th>NetBSD-HEAD (5.99.45)</th>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
+  <th>NetBSD 6.0</th>
+  <td>ami-1400bf7d</td><!-- us-east-1 -->
+  <td>ami-9bac8bde</td><!-- us-west-1 -->
+  <td>ami-22d65f12</td><!-- us-west-2 -->
+  <td>ami-7fc3c30b</td><!-- eu-west-1 -->
+  <td>ami-b6c383e4</td><!-- ap-southeast-1 -->
+  <td>ami-7e2d927f</td><!-- ap-northeast-1 -->
+  <td>ami-c839e0d5</td><!-- sa-east-1 -->
 </tr>
 </table>
 
-## i386 -- 32 bits AMIs
+## i386 -- 32 bit AMIs
 
 The following AMIs are for 32-bit instances.
 
-Note: these AMIs send an email to the maintainer on first launch, to
-help gauge usage.
 
 <table class="center">
 <tr>
@@ -58,21 +71,23 @@ help gauge usage.
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1.2</th>
-  <td>ami-230fdf4a</td>
-  <td>ami-b14f16f4</td>
-  <td>ami-707ef340</td>
-  <td>ami-81d0eef5</td>
-  <td>ami-5c55110e</td>
-  <td>ami-9c6bdd9d</td>
-  <td>ami-e4429df9</td>
-</tr>
-<tr>
-  <th>NetBSD-HEAD (5.99.64)</th>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
+  <th>NetBSD 5.1.2</th><!-- Version -->
+  <td>ami-0e71a967</td><!-- us-east-1 -->
+  <td>ami-472c7702</td><!-- us-west-1 -->
+  <td>ami-f0f27ec0</td><!-- us-west-2 -->
+  <td>ami-27477c53</td><!-- eu-west-1 -->
+  <td>ami-5c55110e</td><!-- ap-southeast-1 -->
+  <td>ami-a8fb4ba9</td><!-- ap-northeast-1 -->
+  <td>ami-e6a37dfb</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0</th>
+  <td>ami-68ff4101</td><!-- us-east-1 -->
+  <td>ami-59b4931c</td><!-- us-west-1 -->
+  <td>ami-6cd65f5c</td><!-- us-west-2 -->
+  <td>ami-abd0d0df</td><!-- eu-west-1 -->
+  <td>ami-70c48422</td><!-- ap-southeast-1 -->
+  <td>ami-562c9357</td><!-- ap-northeast-1 -->
+  <td>ami-e639e0fb</td><!-- sa-east-1 -->
 </tr>
 </table>