diff --git a/files/kojibuilder/builders/fedora-rawhide-pungi-i386.cfg b/files/kojibuilder/builders/fedora-rawhide-pungi-i386.cfg
new file mode 100644
index 0000000000..852ff330c5
--- /dev/null
+++ b/files/kojibuilder/builders/fedora-rawhide-pungi-i386.cfg
@@ -0,0 +1,31 @@
+config_opts['root'] = 'fedora-rawhide-pungi-i386'
+config_opts['target_arch'] = 'i386'
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc9'
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os
+
+[buildroot]
+name=buildroot
+baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/
+"""
diff --git a/files/kojibuilder/builders/fedora-rawhide-pungi-x86_64.cfg b/files/kojibuilder/builders/fedora-rawhide-pungi-x86_64.cfg
new file mode 100644
index 0000000000..7833096635
--- /dev/null
+++ b/files/kojibuilder/builders/fedora-rawhide-pungi-x86_64.cfg
@@ -0,0 +1,34 @@
+config_opts['root'] = 'fedora-rawhide-pungi-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc9'
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
+# .i?86 packages except these.
+exclude=[!g]*.i*86 g[!l]*.i?86  gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86 
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os
+
+[buildroot]
+name=buildroot
+baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/
+"""