--- wikisrc/amazon_ec2.mdwn	2011/03/05 16:23:46	1.42
+++ wikisrc/amazon_ec2.mdwn	2011/03/13 00:33:03	1.45
@@ -79,64 +79,7 @@ AKI, or *Amazon Kernel Image*, are a spe
 
 # Using pre-made AMIs
 
-The following AMIs are publicly available. You can use them to [start a NetBSD instance](#index11h2) quickly, without needing to build your image by hand.
-
-<table>
-<tr>
-  <th>NetBSD version</th>
-  <th>us-east-1 (Virginia)</th>
-  <th>us-west-1 (N. California)</th>
-  <th>eu-west-1 (Ireland)</th>
-  <th>ap-southeast-1 (Singapore)</th>
-  <th>ap-northeast-1 (Tokyo)</th>
-</tr>
-<tr>
-  <th>NetBSD 5.1</th>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong>ami-06b4466f</strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong>ami-99f7a7dc</strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong>ami-cfa296bb</strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong>ami-04e49a56</strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong>ami-dc1bb0dd</strong>
-  </td>
-</tr>
-<tr>
-  <th>NetBSD-HEAD (5.99.45)</th>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong></strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong></strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong></strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong></strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong></strong>
-  </td>
-</tr>
-</table>
+[[!inline pages="amazon_ec2/AMIs" raw="yes"]]
 
 # Build-up your NetBSD system