--- wikisrc/amazon_ec2.mdwn	2011/02/23 19:14:34	1.27
+++ wikisrc/amazon_ec2.mdwn	2011/02/28 00:43:39	1.36
@@ -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></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
 
@@ -101,10 +149,10 @@ ftp -a 'http://ftp.netbsd.org/pub/NetBSD
 tar -xzpf src.tar.gz
 cd src
 # build distribution and kernel
-./build.sh -O ../obj -T ../tools -D ../dest -R ../release -V INSTALLSETS="base etc" -m amd64 -U distribution
+./build.sh -O ../obj -T ../tools -D ../dest -R ../release -m amd64 -U distribution
 ./build.sh -O ../obj -T ../tools -m amd64 kernel=XEN3_DOMU
 # install distribution in /mnt/ec2
-./build.sh -O ../obj -T ../tools -D ../dest -R ../release -U install=/mnt/ec2
+su root ./build.sh -O ../obj -T ../tools -D ../dest -R ../release -U -V INSTALLSETS="base etc" install=/mnt/ec2
 """]]
 
 # Configuration of your NetBSD EC2 tree
@@ -176,7 +224,6 @@ ec2_init()
         )
 }
 
-
 load_rc_config $name
 run_rc_command "$1"
 """]]
@@ -199,7 +246,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 +325,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
 """]]