diff --git a/builder/templates/make-template.ml b/builder/templates/make-template.ml
index e0e9dee4a..4a8d254a4 100755
--- a/builder/templates/make-template.ml
+++ b/builder/templates/make-template.ml
@@ -622,9 +622,15 @@ and make_location os arch =
   | RHEL (4, minor), X86_64 ->
      sprintf "http://download.devel.redhat.com/released/RHEL-4/U%d/AS/x86_64/tree" minor
 
+  | RHEL (5, minor), I686 ->
+     sprintf "http://download.devel.redhat.com/released/RHEL-5-Server/U%d/i386/os" minor
+
   | RHEL (5, minor), X86_64 ->
      sprintf "http://download.devel.redhat.com/released/RHEL-5-Server/U%d/x86_64/os" minor
 
+  | RHEL (6, minor), I686 ->
+     sprintf "http://download.devel.redhat.com/released/RHEL-6/6.%d/Server/i386/os" minor
+
   | RHEL (6, minor), X86_64 ->
      sprintf "http://download.devel.redhat.com/released/RHEL-6/6.%d/Server/x86_64/os" minor
 
@@ -779,20 +785,22 @@ and make_rhel_yum_conf major minor arch =
 
   let baseurl, srpms, optional =
     match major, arch with
-    | 5, X86_64 ->
+    | 5, (I686|X86_64) ->
+       let arch = match arch with I686 -> "i386" | _ -> string_of_arch arch in
        let topurl =
          sprintf "http://download.devel.redhat.com/released/RHEL-5-Server/U%d"
                  minor in
-       sprintf "%s/x86_64/os/Server" topurl,
+       sprintf "%s/%s/os/Server" topurl arch,
        sprintf "%s/source/SRPMS" topurl,
        None
-    | 6, X86_64 ->
+    | 6, (I686|X86_64) ->
+       let arch = match arch with I686 -> "i386" | _ -> string_of_arch arch in
        let topurl =
          sprintf "http://download.devel.redhat.com/released/RHEL-%d/%d.%d"
                  major major minor in
-       sprintf "%s/Server/%s/os" topurl (string_of_arch arch),
+       sprintf "%s/Server/%s/os" topurl arch,
        sprintf "%s/source/SRPMS" topurl,
-       Some (sprintf "%s/Server/optional/%s/os" (string_of_arch arch) topurl,
+       Some (sprintf "%s/Server/optional/%s/os" arch topurl,
              sprintf "%s/Server/optional/source/SRPMS" topurl)
     | 7, (X86_64|Aarch64|PPC64|PPC64le) ->
        let topurl =
diff --git a/builder/templates/rhel-5.11-i686.ks b/builder/templates/rhel-5.11-i686.ks
new file mode 100644
index 000000000..167c30397
--- /dev/null
+++ b/builder/templates/rhel-5.11-i686.ks
@@ -0,0 +1,30 @@
+# Kickstart file for rhel-5.11-i686
+# Generated by libguestfs.git/builder/templates/make-template.ml
+
+install
+text
+reboot
+lang en_US.UTF-8
+keyboard us
+network --bootproto dhcp
+rootpw builder
+firewall --enabled --ssh
+timezone --utc America/New_York
+selinux --enforcing
+key --skip
+
+bootloader --location=mbr --append="console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH"
+
+zerombr
+clearpart --all --initlabel
+part /boot --fstype=ext2   --size=512         --asprimary
+part swap                --size=1024        --asprimary
+part /     --fstype=ext4   --size=1024 --grow --asprimary
+
+# Halt the system once configuration has finished.
+poweroff
+
+%packages
+@core
+
+# EOF
diff --git a/builder/templates/rhel-6.8-i686.ks b/builder/templates/rhel-6.8-i686.ks
new file mode 100644
index 000000000..1a138c7b9
--- /dev/null
+++ b/builder/templates/rhel-6.8-i686.ks
@@ -0,0 +1,30 @@
+# Kickstart file for rhel-6.8-i686
+# Generated by libguestfs.git/builder/templates/make-template.ml
+
+install
+text
+reboot
+lang en_US.UTF-8
+keyboard us
+network --bootproto dhcp
+rootpw builder
+firewall --enabled --ssh
+timezone --utc America/New_York
+selinux --enforcing
+
+bootloader --location=mbr --append="console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH"
+
+zerombr
+clearpart --all --initlabel
+part /boot --fstype=ext4   --size=512         --asprimary
+part swap                --size=1024        --asprimary
+part /     --fstype=ext4   --size=1024 --grow --asprimary
+
+# Halt the system once configuration has finished.
+poweroff
+
+%packages
+@core
+%end
+
+# EOF