diff --git a/gas/ChangeLog b/gas/ChangeLog
index 598c560ccb..12ad6469b5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/9915
+	* config/tc-i386.h (LOCAL_LABELS_DOLLAR): New.  Defined as 0.
+	(LOCAL_LABELS_FB): Undefine befoe define.
+
 2009-03-06  Nick Clifton  <nickc@redhat.com>
 
 	* po/es.po: Updated Spanish translation.
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index db580d88ec..ea2b6530de 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -90,6 +90,10 @@ extern void i386_elf_emit_arch_note (void);
 
 #define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 0
 
+/* '$' may be used as immediate prefix.  */
+#undef LOCAL_LABELS_DOLLAR
+#define LOCAL_LABELS_DOLLAR 0
+#undef LOCAL_LABELS_FB
 #define LOCAL_LABELS_FB 1
 
 extern const char extra_symbol_chars[];