diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 0eea960887f..b8e3253c0bd 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-04 Peter Faltaous
+	Add e_machine values for X86_64.
+	getAttributes(): Add cases for X86_64.
+	This fixes the debug configurations dialog which
+	otherwise states that no debugger is available.
+
+ 	* utils/org/eclipse/cdt/utils/elf/Elf.java:
 2005-02-16 Alain Magloire
 	Fix PR 74034
 	* utils/org/eclipse/cdt/utils/elf/Elf.java
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java
index 5d4fc1f6694..6ae492f591f 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java
@@ -103,6 +103,7 @@ public class Elf {
 		public final static int EM_H8_300 = 46;
 		public final static int EM_H8_300H = 47;
 		public final static int EM_IA_64 = 50;
+		public final static int EM_X86_64 = 62;		
 		public final static int EM_ST100 = 60;
 		public final static int EM_AVR = 83;
 		public final static int EM_FR30 = 84; /* Fujitsu FR30 */
@@ -806,6 +807,9 @@ public class Elf {
 			case Elf.ELFhdr.EM_ST100:
 				attrib.cpu = "st100"; //$NON-NLS-1$
 				break;
+			case Elf.ELFhdr.EM_X86_64:
+				attrib.cpu = "x86_64";
+				break;
 			case Elf.ELFhdr.EM_NONE :
 			default :
 				attrib.cpu = "none"; //$NON-NLS-1$