--- wikisrc/amazon_ec2/amis.mdwn	2012/02/12 16:07:21	1.6
+++ wikisrc/amazon_ec2/amis.mdwn	2015/11/22 01:18:54	1.48
@@ -2,11 +2,20 @@
 
 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
+Starting with the NetBSD 7.0 AMIs, the images have a very small disk
+by default.  If you launch it with a larger disk, it will resize the
+root file system on initial boot, expanding it to the full size of
+your primary disk.  The 6.x AMIs default to a 5GB root file system,
+and do not currently auto-expand.
 
-The following AMIs are for 64 bits instances.
+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 bit instances.
 
 <table class="center">
 <tr>
@@ -14,37 +23,56 @@ 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 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.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</th>
+  <td>ami-bc8fc8d6</td><!-- us-east-1 -->
+  <td>ami-7b0b621b</td><!-- us-west-1 -->
+  <td>ami-9c9f8ffd</td><!-- us-west-2 -->
+  <td>ami-32e6f45e</td><!-- eu-central-1 -->
+  <td>ami-ac983ddf</td><!-- eu-west-1 -->
+  <td>ami-c8ea2bab</td><!-- ap-southeast-1 -->
+  <td>ami-8a89d0e9</td><!-- ap-southeast-2 -->
+  <td>ami-d7eeccb9</td><!-- ap-northeast-1 -->
+  <td>ami-51d0553d</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 +82,41 @@ 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 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.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</th>
+  <td>ami-569ed93c</td><!-- us-east-1 -->
+  <td>ami-fa0e679a</td><!-- us-west-1 -->
+  <td>ami-9f8090fe</td><!-- us-west-2 -->
+  <td>ami-a460c5d7</td><!-- eu-west-1 -->
+  <td>ami-4af33229</td><!-- ap-southeast-1 -->
+  <td>ami-f98bd29a</td><!-- ap-southeast-2 -->
+  <td>ami-c5f8daab</td><!-- ap-northeast-1 -->
+  <td>ami-2bd15447</td><!-- sa-east-1 -->
 </tr>
 </table>