--- wikisrc/amazon_ec2/amis.mdwn	2013/09/29 23:17:48	1.34
+++ wikisrc/amazon_ec2/amis.mdwn	2014/04/18 22:10:12	1.37
@@ -24,48 +24,26 @@ The following AMIs are for 64 bit instan
   <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>-</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 -->
+  <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>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>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</th>
@@ -112,6 +90,28 @@ The following AMIs are for 64 bit instan
   <td>ami-7541e668</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>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>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.1</th>
   <td>ami-8b751ce2</td><!-- us-east-1 -->
   <td>ami-1185aa54</td><!-- us-west-1 -->
@@ -144,6 +144,28 @@ The following AMIs are for 64 bit instan
   <td>ami-8d930d8c</td><!-- ap-northeast-1 -->
   <td>ami-9f44e382</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>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>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>
 </table>
 
 ## i386 -- 32 bit AMIs
@@ -164,48 +186,26 @@ The following AMIs are for 32-bit instan
   <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 -->
+  <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</th>
@@ -252,6 +252,28 @@ The following AMIs are for 32-bit instan
   <td>ami-6b41e676</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.1</th>
   <td>ami-815138e8</td><!-- us-east-1 -->
   <td>ami-db80af9e</td><!-- us-west-1 -->
@@ -284,4 +306,26 @@ The following AMIs are for 32-bit instan
   <td>ami-d3930dd2</td><!-- ap-northeast-1 -->
   <td>ami-c944e3d4</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>
 </table>