diff --git a/pungi/arch.py b/pungi/arch.py
index ab121d99..edd33e19 100644
--- a/pungi/arch.py
+++ b/pungi/arch.py
@@ -17,7 +17,7 @@ from .arch_utils import arches as ALL_ARCHES
 from .arch_utils import getBaseArch, getMultiArchInfo, getArchList
 
 TREE_ARCH_YUM_ARCH_MAP = {
-    "i386": "athlon",
+    "i386": "i686",
     "ppc64": "ppc64p7",
     "sparc": "sparc64v",
     "arm": "armv7l",
diff --git a/tests/test_arch.py b/tests/test_arch.py
index af1b80f9..2ecfa4e8 100644
--- a/tests/test_arch.py
+++ b/tests/test_arch.py
@@ -17,13 +17,13 @@ class TestArch(unittest.TestCase):
 
     def test_i386(self):
         arches = get_valid_arches("i386")
-        self.assertEqual(arches, ['athlon', 'i686', 'i586', 'i486', 'i386', 'noarch'])
+        self.assertEqual(arches, ['i686', 'i586', 'i486', 'i386', 'noarch'])
 
         arches = get_valid_arches("i386", multilib=False)
-        self.assertEqual(arches, ['athlon', 'i686', 'i586', 'i486', 'i386', 'noarch'])
+        self.assertEqual(arches, ['i686', 'i586', 'i486', 'i386', 'noarch'])
 
         arches = get_valid_arches("i386", add_src=True)
-        self.assertEqual(arches, ['athlon', 'i686', 'i586', 'i486', 'i386', 'noarch', 'src'])
+        self.assertEqual(arches, ['i686', 'i586', 'i486', 'i386', 'noarch', 'src'])
 
     def test_x86_64(self):
         arches = get_valid_arches("x86_64")