--- wikisrc/amazon_ec2.mdwn	2011/02/25 00:35:09	1.35
+++ 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-f612e19f</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
 
@@ -224,7 +176,6 @@ ec2_init()
         )
 }
 
-
 load_rc_config $name
 run_rc_command "$1"
 """]]
@@ -254,7 +205,7 @@ fi
 You can then proceed to modifying the system living under */mnt/ec2*, so it can fit your needs (adding custom binaries, packages, etc). When done, build the *NetBSD-AMI.img.gz* ffs image, via [[!template id=man name=makefs section=8]], or **nbmakefs**, from the [toolchain](http://www.netbsd.org/docs/guide/en/chap-build.html#chap-build-tools):
 
 [[!template id=programlisting text="""
-$ makefs -t ffs -B le -s 256m -N /mnt/ec2/etc/ -o density=32k NetBSD-AMI.img /mnt/ec2/ 
+$ makefs -t ffs -B le -s 256m -N /mnt/ec2/etc/ -o density=32k /tmp/NetBSD-AMI.img /mnt/ec2/ 
 Calculated size of `NetBSD-AMI.img': 268435456 bytes, 7345 inodes
 Extent size set to 8192
 NetBSD-AMI.img: 256.0MB (524288 sectors) block size 8192, fragment size 1024