diff --git a/arch/x86/kernel/gencore.c b/arch/x86/kernel/gencore.c
index f7d91713..b474fb11 100644
--- a/arch/x86/kernel/gencore.c
+++ b/arch/x86/kernel/gencore.c
@@ -38,7 +38,11 @@ void fill_elf_header(Elf64_Ehdr *eh, int segs)
 	eh->e_ident[EI_OSABI] = ELFOSABI_NONE;
 	eh->e_ident[EI_ABIVERSION] = El_ABIVERSION_NONE;
 	eh->e_type = ET_CORE;
+#ifdef CONFIG_MIC
 	eh->e_machine = EM_K10M;
+#else
+	eh->e_machine = EM_X86_64;
+#endif
 	eh->e_version = EV_CURRENT;
 	eh->e_entry = 0;	/* Do we really need this? */
 	eh->e_phoff = 64;	/* fixed */
diff --git a/arch/x86/kernel/include/elfcore.h b/arch/x86/kernel/include/elfcore.h
index 821a5b42..d8d91c3d 100644
--- a/arch/x86/kernel/include/elfcore.h
+++ b/arch/x86/kernel/include/elfcore.h
@@ -53,6 +53,7 @@ typedef struct {
 #define	ELFOSABI_NONE	0	/* unspecied */
 #define	El_ABIVERSION_NONE	0	/* unspecied */
 #define	ET_CORE		4	/* Core file */
+#define	EM_X86_64	62	/* AMD x86-64 architecture */
 #define	EM_K10M		181	/* Intel K10M */
 #define	EV_CURRENT	1	/* Current version */