diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 87f6419b7..8aa8fe78c 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-07  Aldy Hernandez  <aldyh@redhat.com>
+	    Michael Snyder  <msnyder@redhat.com>
+	    Stan Cox  <scox@redhat.com>
+
+	* common.h (EM_MS1): Define.
+
+	* ms1.h: New file.
+
 2005-05-31  Richard Henderson  <rth@redhat.com>
 
 	* alpha.h (LITUSE_ALPHA_JSRDIRECT): New.
diff --git a/include/elf/common.h b/include/elf/common.h
index 0a11557d7..104359cb0 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -257,6 +257,8 @@
 /* Ubicom IP2xxx; no ABI */
 #define EM_IP2K_OLD		0x8217
 
+#define EM_MS1                  0x2530  /* Morpho MS1; no ABI */
+
 /* MSP430 magic number
       Written in the absense everything.  */
 #define EM_MSP430_OLD		0x1059
diff --git a/include/elf/ms1.h b/include/elf/ms1.h
new file mode 100644
index 000000000..747dc898d
--- /dev/null
+++ b/include/elf/ms1.h
@@ -0,0 +1,45 @@
+/* MS1  ELF support for BFD.
+   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _ELF_MS1_H
+#define _ELF_MS1_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_ms1_reloc_type)
+  RELOC_NUMBER (R_MS1_NONE, 0)
+  RELOC_NUMBER (R_MS1_16, 1)
+  RELOC_NUMBER (R_MS1_32, 2)
+  RELOC_NUMBER (R_MS1_32_PCREL, 3)
+  RELOC_NUMBER (R_MS1_PC16, 4)
+  RELOC_NUMBER (R_MS1_HI16, 5)
+  RELOC_NUMBER (R_MS1_LO16, 6)
+END_RELOC_NUMBERS(R_MS1_max)
+
+#define EF_MS1_CPU_MRISC	0x00000001	/* default */
+#define EF_MS1_CPU_MRISC2	0x00000002	/* MRISC2 */
+#define EF_MS1_CPU_MASK		0x00000003	/* specific cpu bits */
+#define EF_MS1_ALL_FLAGS	(EF_MS1_CPU_MASK)
+
+/* The location of the memory mapped hardware stack.  */
+#define MS1_STACK_VALUE 0x0f000000
+#define MS1_STACK_SIZE  0x20
+
+#endif /* _ELF_MS1_H */