diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ddbad9630f..1cedf60083 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-16  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* f-lang.c (_initialize_f_language): Do not initialize or
+	swap builtin_type_string.
+
 2007-06-16  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* std-regs.c (builtin_type_frame_reg, build_builtin_type_frame_reg,
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 9f6d0ecce9..353466c44b 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -621,14 +621,8 @@ _initialize_f_language (void)
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s16); 
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s32); 
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_void); 
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_string); 
   deprecated_register_gdbarch_swap (NULL, 0, build_fortran_types);
 
-  builtin_type_string =
-    init_type (TYPE_CODE_STRING, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-	       0,
-	       "character string", (struct objfile *) NULL);
-
   add_language (&f_language_defn);
 }