--- wikisrc/amazon_ec2/amis.mdwn	2012/02/05 19:55:01	1.4
+++ wikisrc/amazon_ec2/amis.mdwn	2013/09/29 23:17:48	1.34
@@ -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.  
 
-The following AMIs are for 64 bits instances.
+## amd64 (x86_64) -- 64 bit AMIs
+
+The following AMIs are for 64 bit instances.
 
 <table class="center">
 <tr>
@@ -16,56 +19,269 @@ The following AMIs are for 64 bits insta
   <th>us-west-2<br />(Oregon)</th>
   <th>eu-west-1<br />(Ireland)</th>
   <th>ap-southeast-1<br />(Singapore)</th>
+  <th>ap-southeast-2<br />(Sydney)</th>
   <th>ap-northeast-1<br />(Tokyo)</th>
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1</th>
-  <td>ami-2da67644</td>
-  <td>ami-99f7a7dc</td>
-  <td>soon</td>
-  <td>ami-9df0cee9</td>
-  <td>ami-a24501f0</td>
-  <td>ami-ac78cead</td>
-  <td>soon</td>
-</tr>
-<tr>
-  <th>NetBSD-HEAD (5.99.45)</th>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
+  <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>-</td><!-- ap-southeast-2 -->
+  <td>ami-10e25211</td><!-- ap-northeast-1 -->
+  <td>ami-5ca17f41</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.1.3</th>
+  <td>ami-bff4a0d6</td><!-- us-east-1 -->
+  <td>ami-fe3b0fbb</td><!-- us-west-1 -->
+  <td>ami-40f26c70</td><!-- us-west-2 -->
+  <td>ami-a619fed1</td><!-- eu-west-1 -->
+  <td>ami-86145ed4</td><!-- ap-southeast-1 -->
+  <td>ami-a96df093</td><!-- ap-southeast-2 -->
+  <td>ami-ff8917fe</td><!-- ap-northeast-1 -->
+  <td>ami-2141e63c</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.2</th>
+  <td>ami-097cfc60</td><!-- us-east-1 -->
+  <td>ami-7ae8c93f</td><!-- us-west-1 -->
+  <td>ami-9abb33aa</td><!-- us-west-2 -->
+  <td>ami-af171adb</td><!-- eu-west-1 -->
+  <td>ami-eec88bbc</td><!-- ap-southeast-1 -->
+  <td>ami-d155c2eb</td><!-- ap-southeast-2 -->
+  <td>ami-c4942cc5</td><!-- ap-northeast-1 -->
+  <td>ami-bca77fa1</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.2.1</th>
+  <td>ami-a7f5a1ce</td><!-- us-east-1 -->
+  <td>ami-a03b0fe5</td><!-- us-west-1 -->
+  <td>ami-92f26ca2</td><!-- us-west-2 -->
+  <td>ami-5418ff23</td><!-- eu-west-1 -->
+  <td>ami-66155f34</td><!-- ap-southeast-1 -->
+  <td>ami-ff6df0c5</td><!-- ap-southeast-2 -->
+  <td>ami-8b86188a</td><!-- ap-northeast-1 -->
+  <td>ami-4f41e652</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <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-a181169b</td><!-- ap-southeast-2 -->
+  <td>ami-7e2d927f</td><!-- ap-northeast-1 -->
+  <td>ami-c839e0d5</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.1</th>
+  <td>ami-a754dbce</td><!-- us-east-1 -->
+  <td>ami-bc3f1ff9</td><!-- us-west-1 -->
+  <td>ami-6ced665c</td><!-- us-west-2 -->
+  <td>ami-18f0fc6c</td><!-- eu-west-1 -->
+  <td>ami-53521001</td><!-- ap-southeast-1 -->
+  <td>ami-011b8c3b</td><!-- ap-southeast-2 -->
+  <td>ami-4a1ea54b</td><!-- ap-northeast-1 -->
+  <td>ami-4809d155</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.2</th>
+  <td>ami-315d3458</td><!-- us-east-1 -->
+  <td>ami-1381ae56</td><!-- us-west-1 -->
+  <td>ami-87d243b7</td><!-- us-west-2 -->
+  <td>ami-e50e1f91</td><!-- eu-west-1 -->
+  <td>ami-ee1a54bc</td><!-- ap-southeast-1 -->
+  <td>ami-</td><!-- ap-southeast-2 -->
+  <td>ami-a126a8a0</td><!-- ap-northeast-1 -->
+  <td>ami-366cb62b</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.3</th>
+  <td>ami-e7f6a28e</td><!-- us-east-1 -->
+  <td>ami-46241003</td><!-- us-west-1 -->
+  <td>ami-f4f26cc4</td><!-- us-west-2 -->
+  <td>ami-d618ffa1</td><!-- eu-west-1 -->
+  <td>ami-e58719e4</td><!-- ap-northeast-1 -->
+  <td>ami-d6155f84</td><!-- ap-southeast-1 -->
+  <td>ami-c56df0ff</td><!-- ap-southeast-2 -->
+  <td>ami-7541e668</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1</th>
+  <td>ami-8b751ce2</td><!-- us-east-1 -->
+  <td>ami-1185aa54</td><!-- us-west-1 -->
+  <td>ami-b1d24381</td><!-- us-west-2 -->
+  <td>ami-e70a1b93</td><!-- eu-west-1 -->
+  <td>ami-2a1d5378</td><!-- ap-southeast-1 -->
+  <td>ami-2136a61b</td><!-- ap-southeast-2 -->
+  <td>ami-1b3fb11a</td><!-- ap-northeast-1 -->
+  <td>ami-c66cb6db</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.1</th>
+  <td>ami-29420240</td><!-- us-east-1 -->
+  <td>ami-54795311</td><!-- us-west-1 -->
+  <td>ami-6a7be65a</td><!-- us-west-2 -->
+  <td>ami-599a822d</td><!-- eu-west-1 -->
+  <td>ami-44c28a16</td><!-- ap-southeast-1 -->
+  <td>ami-b968fa83</td><!-- ap-southeast-2 -->
+  <td>ami-65dd4e64</td><!-- ap-northeast-1 -->
+  <td>ami-1f4de902</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.2</th>
+  <td>ami-f7bbef9e</td><!-- us-east-1 -->
+  <td>ami-a43c08e1</td><!-- us-west-1 -->
+  <td>ami-26fb6516</td><!-- us-west-2 -->
+  <td>ami-7814f30f</td><!-- eu-west-1 -->
+  <td>ami-c8115b9a</td><!-- ap-southeast-1 -->
+  <td>ami-ff70edc5</td><!-- ap-southeast-2 -->
+  <td>ami-8d930d8c</td><!-- ap-northeast-1 -->
+  <td>ami-9f44e382</td><!-- sa-east-1 -->
 </tr>
 </table>
 
-## i386 -- 32 bits AMIs
+## i386 -- 32 bit AMIs
+
+The following AMIs are for 32-bit instances.
 
-32 bits is not currently supported under EC2. The kernel will boot successfully, but it will panic() when executing [[!template id=man name=init section=8]]. Work is in progress to fix this issue.
 
 <table class="center">
 <tr>
   <th>NetBSD version</th>
   <th>us-east-1<br />(Virginia)</th>
   <th>us-west-1<br />(N. California)</th>
+  <th>us-west-2<br />(Oregon)</th>
   <th>eu-west-1<br />(Ireland)</th>
   <th>ap-southeast-1<br />(Singapore)</th>
+  <th>ap-southeast-2<br />(Sydney)</th>
   <th>ap-northeast-1<br />(Tokyo)</th>
+  <th>sa-east-1<br />(Sao Paulo)</th>
+</tr>
+<tr>
+  <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>-</td><!-- ap-southeast-2 -->
+  <td>ami-a8fb4ba9</td><!-- ap-northeast-1 -->
+  <td>ami-e6a37dfb</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.1.3</th>
+  <td>ami-65f5a10c</td><!-- us-east-1 -->
+  <td>ami-923b0fd7</td><!-- us-west-1 -->
+  <td>ami-b4f26c84</td><!-- us-west-2 -->
+  <td>ami-6218ff15</td><!-- eu-west-1 -->
+  <td>ami-49861848</td><!-- ap-northeast-1 -->
+  <td>ami-56155f04</td><!-- ap-southeast-1 -->
+  <td>ami-836df0b9</td><!-- ap-southeast-2 -->
+  <td>ami-5541e648</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.2</th><!-- Version -->
+  <td>ami-637fff0a</td><!-- us-east-1 -->
+  <td>ami-9ce8c9d9</td><!-- us-west-1 -->
+  <td>ami-70bc3440</td><!-- us-west-2 -->
+  <td>ami-a3161bd7</td><!-- eu-west-1 -->
+  <td>ami-76cf8c24</td><!-- ap-southeast-1 -->
+  <td>ami-2f54c315</td><!-- ap-southeast-2 -->
+  <td>ami-4a972f4b</td><!-- ap-northeast-1 -->
+  <td>ami-cca77fd1</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.2.1</th>
+  <td>ami-75f6a21c</td><!-- us-east-1 -->
+  <td>ami-b23b0ff7</td><!-- us-west-1 -->
+  <td>ami-8af26cba</td><!-- us-west-2 -->
+  <td>ami-4c18ff3b</td><!-- eu-west-1 -->
+  <td>ami-6c155f3e</td><!-- ap-southeast-1 -->
+  <td>ami-e76df0dd</td><!-- ap-southeast-2 -->
+  <td>ami-9b87199a</td><!-- ap-northeast-1 -->
+  <td>ami-4141e65c</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-3f801705</td><!-- ap-southeast-2 -->
+  <td>ami-562c9357</td><!-- ap-northeast-1 -->
+  <td>ami-e639e0fb</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.1</th>
+  <td>ami-5d0f8034</td><!-- us-east-1 -->
+  <td>ami-1800205d</td><!-- us-west-1 -->
+  <td>ami-f0ed66c0</td><!-- us-west-2 -->
+  <td>ami-00f2fe74</td><!-- eu-west-1 -->
+  <td>ami-6f52103d</td><!-- ap-southeast-1 -->
+  <td>ami-6b1b8c51</td><!-- ap-southeast-2 -->
+  <td>ami-8e15ae8f</td><!-- ap-northeast-1 -->
+  <td>ami-e409d1f9</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.2</th>
+  <td>ami-995039f0</td><!-- us-east-1 -->
+  <td>ami-8b80afce</td><!-- us-west-1 -->
+  <td>ami-d5d544e5</td><!-- us-west-2 -->
+  <td>ami-cf0e1fbb</td><!-- eu-west-1 -->
+  <td>ami-i881b55da</td><!-- ap-southeast-1 -->
+  <td>ami-cd37a7f7</td><!-- ap-southeast-2 -->
+  <td>ami-9b3eb09a</td><!-- ap-northeast-1 -->
+  <td>ami-d26cb6cf</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.3</th>
+  <td>ami-aff6a2c6</td><!-- us-east-1 -->
+  <td>ami-42241007</td><!-- us-west-1 -->
+  <td>ami-e8f26cd8</td><!-- us-west-2 -->
+  <td>ami-b218ffc5</td><!-- eu-west-1 -->
+  <td>ami-e2155fb0</td><!-- ap-southeast-1 -->
+  <td>ami-216cf11b</td><!-- ap-southeast-2 -->
+  <td>ami-3d841a3c</td><!-- ap-northeast-1 -->
+  <td>ami-6b41e676</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1</th>
+  <td>ami-815138e8</td><!-- us-east-1 -->
+  <td>ami-db80af9e</td><!-- us-west-1 -->
+  <td>ami-cbd243fb</td><!-- us-west-2 -->
+  <td>ami-5d0f1e29</td><!-- eu-west-1 -->
+  <td>ami-fe1b55ac</td><!-- ap-southeast-1 -->
+  <td>ami-1337a729</td><!-- ap-southeast-2 -->
+  <td>ami-4523ad44</td><!-- ap-northeast-1 -->
+  <td>ami-2c6cb631</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 5.1</th>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
+  <th>NetBSD 6.1.1</th>
+  <td>ami-0345056a</td><!-- us-east-1 -->
+  <td>ami-7c795339</td><!-- us-west-1 -->
+  <td>ami-127ae722</td><!-- us-west-2 -->
+  <td>ami-a79c84d3</td><!-- eu-west-1 -->
+  <td>ami-8ac28ad8</td><!-- ap-southeast-1 -->
+  <td>ami-f568facf</td><!-- ap-southeast-2 -->
+  <td>ami-2bc4572a</td><!-- ap-northeast-1 -->
+  <td>ami-5d4de940</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD-HEAD (5.99.45)</th>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
-  <td></td>
+  <th>NetBSD 6.1.2</th>
+  <td>ami-65a7f30c</td><!-- us-east-1 -->
+  <td>ami-223d0967</td><!-- us-west-1 -->
+  <td>ami-70fb6540</td><!-- us-west-2 -->
+  <td>ami-2013f457</td><!-- eu-west-1 -->
+  <td>ami-8e115bdc</td><!-- ap-southeast-1 -->
+  <td>ami-3973ee03</td><!-- ap-southeast-2 -->
+  <td>ami-d3930dd2</td><!-- ap-northeast-1 -->
+  <td>ami-c944e3d4</td><!-- sa-east-1 -->
 </tr>
 </table>