--- wikisrc/amazon_ec2/amis.mdwn	2012/02/12 16:08:44	1.7
+++ wikisrc/amazon_ec2/amis.mdwn	2015/06/20 21:29:51	1.45
@@ -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, or a bootstrap script to help fetch them when necessary.
+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>
@@ -14,37 +17,128 @@ The following AMIs are for 64 bits insta
   <th>us-east-1<br />(Virginia)</th>
   <th>us-west-1<br />(N. California)</th>
   <th>us-west-2<br />(Oregon)</th>
+  <th>eu-central-1<br />(Frankfurt)</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-a7742de2</td>
-  <td>ami-5c75f86c</td>
-  <td>ami-9df0cee9</td>
-  <td>ami-a24501f0</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 5.1.4</th>
+  <td>ami-738eb31a</td><!-- us-east-1 -->
+  <td>ami-8cc5f7c9</td><!-- us-west-1 -->
+  <td>ami-6e16765e</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-226e9a55</td><!-- eu-west-1 -->
+  <td>ami-4e31671c</td><!-- ap-southeast-1 -->
+  <td>ami-815ec0bb</td><!-- ap-southeast-2 -->
+  <td>ami-75c8a174</td><!-- ap-northeast-1 -->
+  <td>ami-c96dcdd4</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.2.2</th>
+  <td>ami-198cb170</td><!-- us-east-1 -->
+  <td>ami-20c5f765</td><!-- us-west-1 -->
+  <td>ami-841575b4</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-106d9967</td><!-- eu-west-1 -->
+  <td>ami-643f6936</td><!-- ap-southeast-1 -->
+  <td>ami-b15ec08b</td><!-- ap-southeast-2 -->
+  <td>ami-d1f79ed0</td><!-- ap-northeast-1 -->
+  <td>ami-876dcd9a</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.4</th>
+  <td>ami-e192af88</td><!-- us-east-1 -->
+  <td>ami-5cc5f719</td><!-- us-west-1 -->
+  <td>ami-48157578</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-6c6d991b</td><!-- eu-west-1 -->
+  <td>ami-0830665a</td><!-- ap-southeast-1 -->
+  <td>ami-695ec053</td><!-- ap-southeast-2 -->
+  <td>ami-81f59c80</td><!-- ap-northeast-1 -->
+  <td>ami-936dcd8e</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.5</th>
+  <td>ami-45465e2c</td><!-- us-east-1 -->
+  <td>ami-22300867</td><!-- us-west-1 -->
+  <td>ami-883643b8</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-154bb162</td><!-- eu-west-1 -->
+  <td>ami-c47f2c96</td><!-- ap-southeast-1 -->
+  <td>ami-3108900b</td><!-- ap-southeast-2 -->
+  <td>ami-b52853b4</td><!-- ap-northeast-1 -->
+  <td>ami-5119bb4c</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.6</th>
+  <td>ami-ee229a86</td><!-- us-east-1 -->
+  <td>ami-ab5a4fee</td><!-- us-west-1 -->
+  <td>ami-43e2ae73</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-c62d81b1</td><!-- eu-west-1 -->
+  <td>ami-6e98be3c</td><!-- ap-southeast-1 -->
+  <td>ami-c3402df9</td><!-- ap-southeast-2 -->
+  <td>ami-7decda7c</td><!-- ap-northeast-1 -->
+  <td>ami-5fa61242</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.3</th>
+  <td>ami-1d90ad74</td><!-- us-east-1 -->
+  <td>ami-aea092eb</td><!-- us-west-1 -->
+  <td>ami-30076700</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-6a7d891d</td><!-- eu-west-1 -->
+  <td>ami-dc34628e</td><!-- ap-southeast-1 -->
+  <td>ami-a1a33d9b</td><!-- ap-southeast-2 -->
+  <td>ami-93e68f92</td><!-- ap-northeast-1 -->
+  <td>ami-6b6dcd76</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.4</th>
+  <td>ami-87435bee</td><!-- us-east-1 -->
+  <td>ami-223e0667</td><!-- us-west-1 -->
+  <td>ami-26344116</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-6b55af1c</td><!-- eu-west-1 -->
+  <td>ami-7e7f2c2c</td><!-- ap-southeast-1 -->
+  <td>ami-fb178fc1</td><!-- ap-southeast-2 -->
+  <td>ami-ab2a51aa</td><!-- ap-northeast-1 -->
+  <td>ami-2f19bb32</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.5</th>
+  <td>ami-bc2c94d4</td><!-- us-east-1 -->
+  <td>ami-415a4f04</td><!-- us-west-1 -->
+  <td>ami-6ffbb75f</td><!-- us-west-2 -->
+  <td>-</td><!-- eu-central-1 -->
+  <td>ami-f253ff85</td><!-- eu-west-1 -->
+  <td>ami-989bbdca</td><!-- ap-southeast-1 -->
+  <td>ami-63402d59</td><!-- ap-southeast-2 -->
+  <td>ami-51e2d450</td><!-- ap-northeast-1 -->
+  <td>ami-f1a511ec</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 7.0_RC1</th>
+  <td>ami-5bde2130</td><!-- us-east-1 -->
+  <td>ami-51926515</td><!-- us-west-1 -->
+  <td>ami-1fdadf2f</td><!-- us-west-2 -->
+  <td>ami-00bf871d</td><!-- eu-central-1 -->
+  <td>ami-8dc3b9fa</td><!-- eu-west-1 -->
+  <td>ami-94dfdbc6</td><!-- ap-southeast-1 -->
+  <td>ami-efa5dfd5</td><!-- ap-southeast-2 -->
+  <td>ami-b82d89b8</td><!-- ap-northeast-1 -->
+  <td>ami-ff8b09e2</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.
+*Note: eu-central-1 (Frankfurt) does not have instances capable of running 32-bit PV AMIs.*
 
 <table class="center">
 <tr>
@@ -54,25 +148,107 @@ help gauge usage.
   <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>
-  <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.4</th>
+  <td>ami-0d82bf64</td><!-- us-east-1 -->
+  <td>ami-50c8fa15</td><!-- us-west-1 -->
+  <td>ami-7e1a7a4e</td><!-- us-west-2 -->
+  <td>ami-206a9e57</td><!-- eu-west-1 -->
+  <td>ami-223e6870</td><!-- ap-southeast-1 -->
+  <td>ami-b95fc183</td><!-- ap-southeast-2 -->
+  <td>ami-bbd9b0ba</td><!-- ap-northeast-1 -->
+  <td>ami-776ece6a</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 5.2.2</th>
+  <td>ami-3583be5c</td><!-- us-east-1 -->
+  <td>ami-cccefc89</td><!-- us-west-1 -->
+  <td>ami-fa1979ca</td><!-- us-west-2 -->
+  <td>ami-ca699dbd</td><!-- eu-west-1 -->
+  <td>ami-1a3e6848</td><!-- ap-southeast-1 -->
+  <td>ami-4f5fc175</td><!-- ap-southeast-2 -->
+  <td>ami-03d9b002</td><!-- ap-northeast-1 -->
+  <td>ami-476ece5a</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.4</th>
+  <td>ami-8b87bae2</td><!-- us-east-1 -->
+  <td>ami-30cbf975</td><!-- us-west-1 -->
+  <td>ami-7c19794c</td><!-- us-west-2 -->
+  <td>ami-14689c63</td><!-- eu-west-1 -->
+  <td>ami-ac3167fe</td><!-- ap-southeast-1 -->
+  <td>ami-6f5fc155</td><!-- ap-southeast-2 -->
+  <td>ami-f1c4adf0</td><!-- ap-northeast-1 -->
+  <td>ami-236ece3e</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.5</th>
+  <td>ami-fd2f3794</td><!-- us-east-1 -->
+  <td>ami-da2b139f</td><!-- us-west-1 -->
+  <td>ami-e42d58d4</td><!-- us-west-2 -->
+  <td>ami-ad9550da</td><!-- eu-west-1 -->
+  <td>ami-02613250</td><!-- ap-southeast-1 -->
+  <td>ami-450b937f</td><!-- ap-southeast-2 -->
+  <td>ami-11146f10</td><!-- ap-northeast-1 -->
+  <td>ami-a7ef42ba</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.0.6</th>
+  <td>ami-62249c0a</td><!-- us-east-1 -->
+  <td>ami-7945503c</td><!-- us-west-1 -->
+  <td>ami-ede2aedd</td><!-- us-west-2 -->
+  <td>ami-302e8247</td><!-- eu-west-1 -->
+  <td>ami-3498be66</td><!-- ap-southeast-1 -->
+  <td>ami-1d432e27</td><!-- ap-southeast-2 -->
+  <td>ami-b7eadcb6</td><!-- ap-northeast-1 -->
+  <td>ami-73a6126e</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.3</th>
+  <td>ami-a185b8c8</td><!-- us-east-1 -->
+  <td>ami-e4cefca1</td><!-- us-west-1 -->
+  <td>ami-50187860</td><!-- us-west-2 -->
+  <td>ami-7e689c09</td><!-- eu-west-1 -->
+  <td>ami-fa3167a8</td><!-- ap-southeast-1 -->
+  <td>ami-1f5fc125</td><!-- ap-southeast-2 -->
+  <td>ami-13c2ab12</td><!-- ap-northeast-1 -->
+  <td>ami-016ece1c</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.4</th>
+  <td>ami-cd2b33a4</td><!-- us-east-1 -->
+  <td>ami-6c2b1329</td><!-- us-west-1 -->
+  <td>ami-fc2257cc</td><!-- us-west-2 -->
+  <td>ami-294fb55e</td><!-- eu-west-1 -->
+  <td>ami-be7e2dec</td><!-- ap-southeast-1 -->
+  <td>ami-7d089047</td><!-- ap-southeast-2 -->
+  <td>ami-a52e55a4</td><!-- ap-northeast-1 -->
+  <td>ami-4b1ebc56</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 6.1.5</th>
+  <td>ami-b618a0de</td><!-- us-east-1 -->
+  <td>ami-3d5a4f78</td><!-- us-west-1 -->
+  <td>ami-3be2ae0b</td><!-- us-west-2 -->
+  <td>ami-aa2c80dd</td><!-- eu-west-1 -->
+  <td>ami-5a98be08</td><!-- ap-southeast-1 -->
+  <td>ami-fd402dc7</td><!-- ap-southeast-2 -->
+  <td>ami-3befd93a</td><!-- ap-northeast-1 -->
+  <td>ami-07a6121a</td><!-- sa-east-1 -->
+</tr>
+<tr>
+  <th>NetBSD 7.0_RC1</th>
+  <td>ami-cbde21a0</td><!-- us-east-1 -->
+  <td>ami-61926525</td><!-- us-west-1 -->
+  <td>ami-6ddadf5d</td><!-- us-west-2 -->
+  <td>ami-53c0ba24</td><!-- eu-west-1 -->
+  <td>ami-aedfdbfc</td><!-- ap-southeast-1 -->
+  <td>ami-dfa5dfe5</td><!-- ap-southeast-2 -->
+  <td>ami-982e8a98</td><!-- ap-northeast-1 -->
+  <td>ami-f78b09ea</td><!-- sa-east-1 -->
 </tr>
 </table>