diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index dff7a979b6a..6c1c0c73ffe 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-08 Alain Magloire
+
+	Patch from Dirk Dörr.
+
+	* utils/org/eclipse/cdt/utils/elf/Elf.java
+
 2004-06-07 Alain Magloire
 
 	Fix for PR 64090
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 8dfa9819bf8..4367ca3aa5c 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
@@ -91,11 +91,13 @@ 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_AVR = 83;
 		public final static int EM_FR30 = 84;     /* Fujitsu FR30 */
 		public final static int EM_V850 = 87;
 		public final static int EM_M32R = 88;
 		public final static int EM_MN10300 = 89;
 		public final static int EM_MN10200 = 90;
+		public final static int EM_MSP430 = 105;
 		public final static int EM_EXCESS = 111;
 		public final static int EM_NIOSII = 113;
 		public final static int EM_NIOS = 0xFEBB;
@@ -661,6 +663,12 @@ public class Elf {
 			case Elf.ELFhdr.EM_IA_64:
 				attrib.cpu = "ia64"; //$NON-NLS-1$
 				break;
+			case Elf.ELFhdr.EM_AVR:
+				attrib.cpu = "avr";
+			break;
+			case Elf.ELFhdr.EM_MSP430:
+				attrib.cpu = "msp430";
+				break;
 			case Elf.ELFhdr.EM_NONE:
 			default:
 				attrib.cpu = "none"; //$NON-NLS-1$