diff --git a/gas/ChangeLog b/gas/ChangeLog
index a7f1a184dc..eca2c129f4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-24  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* config/tc-ft32.h (DEFAULT_TARGET_FORMAT): Remove.
+	(ft32_target_format): Likewise.
+	(TARGET_FORMAT): Adjust.
+
 2016-05-24  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
 
 	* config/tc-ia64.c (dot_rot): simplify allocations from obstacks.
diff --git a/gas/config/tc-ft32.h b/gas/config/tc-ft32.h
index 7b92a290da..3829331b5a 100644
--- a/gas/config/tc-ft32.h
+++ b/gas/config/tc-ft32.h
@@ -24,9 +24,7 @@
 #define WORKING_DOT_WORD
 
 /* This macro is the BFD architecture to pass to `bfd_set_arch_mach'.  */
-const char *ft32_target_format;
-#define DEFAULT_TARGET_FORMAT  "elf32-ft32"
-#define TARGET_FORMAT          ft32_target_format
+#define TARGET_FORMAT  "elf32-ft32"
 
 #define TARGET_ARCH bfd_arch_ft32