diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 369b50b8f7a..e6c2b954ca8 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-19 Alain Magloire
+	Patch contributed by James Langley.
+	Let Elf.java recognize Altera?s Nios and Nios II magic numbers.
+	The number for Nios II is an official number assigned by SCO,
+	the one for Nios was randomly chosen, but doesn't conflict with
+	any of the ones already in Elf.java. 
+	
+	* Elf.java
+
 2004-05-18 Alain Magloire
 
 	Remove warnings and compatibility plugin
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 2f026e38b78..f002ed01220 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
@@ -98,6 +98,8 @@ public class Elf {
 		public final static int EM_MN10300 = 89;
 		public final static int EM_MN10200 = 90;
 		public final static int EM_EXCESS = 111;
+		public final static int EM_NIOSII = 113;
+		public final static int EM_NIOS = 0xFEBB;
 		public final static int EM_CYGNUS_POWERPC = 0x9025;
 		public final static int EM_CYGNUS_M32R = 0x9041;
 		public final static int EM_CYGNUS_V850 = 0x9080;
@@ -796,6 +798,12 @@ public class Elf {
 			case Elf.ELFhdr.EM_EXCESS:
 				attrib.cpu = "excess"; //$NON-NLS-1$
 				break;
+			case Elf.ELFhdr.EM_NIOSII :
+				attrib.cpu = "alteranios2";
+				break;
+			case Elf.ELFhdr.EM_NIOS :
+				attrib.cpu = "alteranios";
+				break;
 			case Elf.ELFhdr.EM_IA_64:
 				attrib.cpu = "ia64"; //$NON-NLS-1$
 				break;