diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index a21bc3eb7..5909f3e71 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	common.h (EM_CRIS): New machine number.
+	cris.h: New file.
+
 2000-07-19  H.J. Lu  <hjl@gnu.org>
 
 	* common.h (DF_1_NODEFLIB): Renamed from DF_1_NODEPLIB.
diff --git a/include/elf/common.h b/include/elf/common.h
index b2908539b..b116d540b 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -151,6 +151,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define EM_SVX         73	/* Silicon Graphics SVx */
 #define EM_ST19        74	/* STMicroelectronics ST19 8-bit microcontroller */
 #define EM_VAX         75	/* Digital VAX */
+#define EM_CRIS	       76	/* Axis Communications 32-bit embedded processor */
 
 #define EM_PJ          99       /* picoJava */
 
diff --git a/include/elf/cris.h b/include/elf/cris.h
new file mode 100644
index 000000000..576630d84
--- /dev/null
+++ b/include/elf/cris.h
@@ -0,0 +1,44 @@
+/* CRIS ELF support for BFD.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   Contributed by Axis Communications AB, Lund, Sweden.
+   Written by Hans-Peter Nilsson.
+
+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_CRIS_H
+#define _ELF_CRIS_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_cris_reloc_type)
+  RELOC_NUMBER (R_CRIS_NONE,		0)
+  RELOC_NUMBER (R_CRIS_8,		1)
+  RELOC_NUMBER (R_CRIS_16,		2)
+  RELOC_NUMBER (R_CRIS_32,		3)
+  RELOC_NUMBER (R_CRIS_8_PCREL,		4)
+  RELOC_NUMBER (R_CRIS_16_PCREL,	5)
+  RELOC_NUMBER (R_CRIS_32_PCREL,	6)
+
+  RELOC_NUMBER (R_CRIS_GNU_VTINHERIT,	7)
+  RELOC_NUMBER (R_CRIS_GNU_VTENTRY,	8)
+
+  /* No other relocs must be visible outside the assembler.  */
+
+END_RELOC_NUMBERS (R_CRIS_max)
+
+#endif /* _ELF_CRIS_H */