--- wikisrc/amazon_ec2.mdwn	2011/03/02 01:26:53	1.38
+++ wikisrc/amazon_ec2.mdwn	2011/03/13 00:33:03	1.45
@@ -79,55 +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-west-1</th>
-  <th>us-east-1</th>
-  <th>eu-west-1</th>
-  <th>ap-southeast-1</th>
-</tr>
-<tr>
-  <th>NetBSD 5.1.0_PATCH</th>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong></strong>
-  </td>
-  <td>
-      32 bits: <strong></strong><br/>
-      64 bits: <strong>ami-fe7c8f97</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>
-<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>
-</tr>
-</table>
+[[!inline pages="amazon_ec2/AMIs" raw="yes"]]
 
 # Build-up your NetBSD system