--- wikisrc/amazon_ec2.mdwn	2011/02/23 21:43:16	1.30
+++ wikisrc/amazon_ec2.mdwn	2011/02/25 00:35:09	1.35
@@ -79,7 +79,55 @@ AKI, or *Amazon Kernel Image*, are a spe
 
 # Using pre-made AMIs
 
-XXX TODO
+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>
 
 # Build-up your NetBSD system
 
@@ -199,7 +247,7 @@ procfs     /proc    procfs rw
 EOF
 # EC2 startup script (if you installed it)
 if [ -f etc/rc.d/ec2_init ]; then
-    chmod 755 etc/rc.d/ec2_init
+    chmod 555 etc/rc.d/ec2_init
 fi
 """]]
 
@@ -278,7 +326,7 @@ ATTACHMENT      vol-24f88d4c    i-5babe7
 Before we can connect to our brand new instance, we have to allow connections on SSH port (22) through the AWS EC2 firewall:
 
 [[!template id=programlisting text="""
-$ ec2-authorize default -p 22
+$ ec2-authorize default -p 22 --region us-east-1
 GROUP           default 
 PERMISSION              default ALLOWS  tcp     22      22      FROM    CIDR    0.0.0.0/0
 """]]