diff --git a/mock/c6.99.00-i386.cfg b/mock/c6.99.00-i386.cfg
new file mode 120000
index 0000000..f5056a0
--- /dev/null
+++ b/mock/c6.99.00-i386.cfg
@@ -0,0 +1 @@
+c6.99.00-i686.cfg
\ No newline at end of file
diff --git a/mock/c6.99.00-i686.cfg b/mock/c6.99.00-i686.cfg
new file mode 100644
index 0000000..3996679
--- /dev/null
+++ b/mock/c6.99.00-i686.cfg
@@ -0,0 +1,46 @@
+config_opts['root'] = 'c6.99.00-i686'
+config_opts['basedir'] = 'MOCKROOT'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',)
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
+
+config_opts['%centos_ver'] = "7"
+config_opts['macros']['%centos_ver'] = "7"
+config_opts['macros']['%rhel'] = "7"
+config_opts['macros']['%el7'] = "1"
+config_opts['macros']['%redhat'] = "7"
+config_opts['macros']['%vendor'] = "CentOS"
+config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+config_opts['macros']['%_host'] = "i386-redhat-linux-gnu"
+
+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
+syslog_ident=mock
+syslog_device=
+
+exclude=*.x86_64
+
+# repos
+[base]
+name=f19-i686
+enabled=1
+baseurl=http://repohost/repo/mirror/f19-i686/
+
+# Also consume what we build in realtime
+[c6.99.00]
+name=c6.99.00
+enabled=1
+baseurl=http://repohost/tmp/repo/c6.99.00/
+
+"""
diff --git a/mock/c6.99.00.el7-i386.cfg b/mock/c6.99.00.el7-i386.cfg
deleted file mode 120000
index b69bf95..0000000
--- a/mock/c6.99.00.el7-i386.cfg
+++ /dev/null
@@ -1 +0,0 @@
-c6.99.00.el7-i686.cfg
\ No newline at end of file
diff --git a/mock/c6.99.00.el7-i686.cfg b/mock/c6.99.00.el7-i686.cfg
deleted file mode 100644
index 3996679..0000000
--- a/mock/c6.99.00.el7-i686.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-config_opts['root'] = 'c6.99.00-i686'
-config_opts['basedir'] = 'MOCKROOT'
-config_opts['target_arch'] = 'i686'
-config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['%centos_ver'] = "7"
-config_opts['macros']['%centos_ver'] = "7"
-config_opts['macros']['%rhel'] = "7"
-config_opts['macros']['%el7'] = "1"
-config_opts['macros']['%redhat'] = "7"
-config_opts['macros']['%vendor'] = "CentOS"
-config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
-config_opts['macros']['%_vendor'] = "redhat"
-config_opts['macros']['%_vendor_host'] = "redhat"
-config_opts['macros']['%_host'] = "i386-redhat-linux-gnu"
-
-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
-syslog_ident=mock
-syslog_device=
-
-exclude=*.x86_64
-
-# repos
-[base]
-name=f19-i686
-enabled=1
-baseurl=http://repohost/repo/mirror/f19-i686/
-
-# Also consume what we build in realtime
-[c6.99.00]
-name=c6.99.00
-enabled=1
-baseurl=http://repohost/tmp/repo/c6.99.00/
-
-"""
diff --git a/mock/c6.99.01-i386.cfg b/mock/c6.99.01-i386.cfg
new file mode 120000
index 0000000..871e635
--- /dev/null
+++ b/mock/c6.99.01-i386.cfg
@@ -0,0 +1 @@
+c6.99.01-i686.cfg
\ No newline at end of file
diff --git a/mock/c6.99.01-i686.cfg b/mock/c6.99.01-i686.cfg
new file mode 100644
index 0000000..00d36bb
--- /dev/null
+++ b/mock/c6.99.01-i686.cfg
@@ -0,0 +1,45 @@
+config_opts['root'] = 'c6.99.01-i686'
+config_opts['basedir'] = 'MOCKROOT'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',)
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
+
+config_opts['%centos_ver'] = "7"
+config_opts['macros']['%centos_ver'] = "7"
+config_opts['macros']['%rhel'] = "7"
+config_opts['macros']['%el7'] = "1"
+config_opts['macros']['%redhat'] = "7"
+config_opts['macros']['%vendor'] = "CentOS"
+config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+config_opts['macros']['%_host'] = "i386-redhat-linux-gnu"
+
+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
+syslog_ident=mock
+syslog_device=
+
+exclude=*.x86_64
+
+# repos
+[c6.99.00]
+name=c6.99.00
+enabled=1
+baseurl=http://repohost/tmp/repo/c6.99.00/
+
+[c6.99.01]
+name=c6.99.01
+enabled=1
+baseurl=http://repohost/tmp/repo/c6.99.01/
+
+"""
diff --git a/mock/c6.99.01.el7-i386.cfg b/mock/c6.99.01.el7-i386.cfg
deleted file mode 120000
index 4b881be..0000000
--- a/mock/c6.99.01.el7-i386.cfg
+++ /dev/null
@@ -1 +0,0 @@
-c6.99.01.el7-i686.cfg
\ No newline at end of file
diff --git a/mock/c6.99.01.el7-i686.cfg b/mock/c6.99.01.el7-i686.cfg
deleted file mode 100644
index 00d36bb..0000000
--- a/mock/c6.99.01.el7-i686.cfg
+++ /dev/null
@@ -1,45 +0,0 @@
-config_opts['root'] = 'c6.99.01-i686'
-config_opts['basedir'] = 'MOCKROOT'
-config_opts['target_arch'] = 'i686'
-config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['%centos_ver'] = "7"
-config_opts['macros']['%centos_ver'] = "7"
-config_opts['macros']['%rhel'] = "7"
-config_opts['macros']['%el7'] = "1"
-config_opts['macros']['%redhat'] = "7"
-config_opts['macros']['%vendor'] = "CentOS"
-config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
-config_opts['macros']['%_vendor'] = "redhat"
-config_opts['macros']['%_vendor_host'] = "redhat"
-config_opts['macros']['%_host'] = "i386-redhat-linux-gnu"
-
-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
-syslog_ident=mock
-syslog_device=
-
-exclude=*.x86_64
-
-# repos
-[c6.99.00]
-name=c6.99.00
-enabled=1
-baseurl=http://repohost/tmp/repo/c6.99.00/
-
-[c6.99.01]
-name=c6.99.01
-enabled=1
-baseurl=http://repohost/tmp/repo/c6.99.01/
-
-"""