diff --git a/gas/ChangeLog b/gas/ChangeLog
index 20259b753a..285d8ff19b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.tgt (i386-*-gnu*): Set em=gnu.
+	* config/te-gnu.h: New file.
+	* config/tc-i386.c: Don't use '/' as comment char for TE_GNU.
+
 2005-11-16  Alan Modra  <amodra@bigpond.net.au>
 
 	* config/tc-ppc.c (ppc_pe_comm): Set bfd_com_section segment.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index bf7a7b05d0..1828c481de 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -198,6 +198,7 @@ const char extra_symbol_chars[] = "*%-(["
 
 #if (defined (TE_I386AIX)				\
      || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF))	\
+	 && !defined (TE_GNU)				\
 	 && !defined (TE_LINUX)				\
  	 && !defined (TE_NETWARE)			\
 	 && !defined (TE_FreeBSD)			\
diff --git a/gas/config/te-gnu.h b/gas/config/te-gnu.h
new file mode 100644
index 0000000000..1d1d442786
--- /dev/null
+++ b/gas/config/te-gnu.h
@@ -0,0 +1,4 @@
+#define TE_GNU
+#define LOCAL_LABELS_FB 1
+
+#include "obj-format.h"
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 28a44bbdaf..ce46561245 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -202,7 +202,7 @@ case ${generic_target} in
   i386-*-msdosdjgpp* \
   | i386-*-go32*)			fmt=coff em=go32 ;;
   i386-*-rtems*)			fmt=elf ;;
-  i386-*-gnu*)				fmt=elf ;;
+  i386-*-gnu*)				fmt=elf em=gnu ;;
   i386-*-mach*)				fmt=aout em=mach ;;
   i386-*-msdos*)			fmt=aout ;;
   i386-*-moss*)				fmt=elf ;;