--- wikisrc/amazon_ec2/amis.mdwn	2013/08/18 01:28:09	1.32
+++ wikisrc/amazon_ec2/amis.mdwn	2014/11/05 18:44:37	1.42
@@ -17,6 +17,7 @@ The following AMIs are for 64 bit instan
   <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>
@@ -24,81 +25,112 @@ 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.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 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.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 -->
+  <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_BETA_201411041110Z</th>
+  <td>ami-848a04ec</td><!-- us-east-1 -->
+  <td>ami-25e4f360</td><!-- us-west-1 -->
+  <td>ami-f586cec5</td><!-- us-west-2 -->
+  <td>ami-72cdfb6f</td><!-- eu-central-1 -->
+  <td>ami-f44fe583</td><!-- eu-west-1 -->
+  <td>ami-945271c6</td><!-- ap-southeast-1 -->
+  <td>ami-996d02a3</td><!-- ap-southeast-2 -->
+  <td>ami-61a59a60</td><!-- ap-northeast-1 -->
+  <td>ami-c301b6de</td><!-- sa-east-1 -->
 </tr>
 </table>
 
@@ -106,6 +138,7 @@ The following AMIs are for 64 bit instan
 
 The following AMIs are for 32-bit instances.
 
+### Note: eu-central-1 (Frankfurt) does not have instances capable of running 32-bit PV AMIs.
 
 <table class="center">
 <tr>
@@ -120,80 +153,102 @@ 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.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 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.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 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 -->
+  <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_BETA_201411041110Z</th>
+  <td>ami-a28d03ca</td><!-- us-east-1 -->
+  <td>ami-73e4f336</td><!-- us-west-1 -->
+  <td>ami-5587cf65</td><!-- us-west-2 -->
+  <td>ami-184ee46f</td><!-- eu-west-1 -->
+  <td>ami-24527176</td><!-- ap-southeast-1 -->
+  <td>ami-5f6d0265</td><!-- ap-southeast-2 -->
+  <td>ami-efa699ee</td><!-- ap-northeast-1 -->
+  <td>ami-3101b62c</td><!-- sa-east-1 -->
 </tr>
 </table>