diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d2ed9361d53..e13ad35bfa9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec  2 10:26:16 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (TARGET_UNDERSCORE): Revert back to '_'
+	(USER_LABEL_PREFIX): Revert back to '_'
+
+	* config.bfd (targ_cpu): Add support for Thumb target.
+
 Mon Dec  1 20:24:18 1997  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* coff-sh.c (sh_coff_howtos): Add R_SH_SWITCH8 entry.
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 10c5ac0d926..1d9c979566c 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -152,8 +152,8 @@ coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
   return bfd_reloc_continue;
 }
 
-/* #define TARGET_UNDERSCORE '_' */
-#define TARGET_UNDERSCORE '\0'
+#define TARGET_UNDERSCORE '_'
+/* #define TARGET_UNDERSCORE '\0' */
 
 #ifndef PCRELOFFSET
 #define PCRELOFFSET true
@@ -1977,7 +1977,8 @@ coff_arm_bfd_copy_private_bfd_data (src, dest)
 /* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
  *must* match the definitions on gcc/config/arm/semi.h.  */
 #define LOCAL_LABEL_PREFIX "."
-#define USER_LABEL_PREFIX ""
+#define USER_LABEL_PREFIX "_"
+/* #define USER_LABEL_PREFIX "" */
 
 static boolean
 coff_arm_is_local_label_name (abfd, name)