diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b032c85bbac..cc38bbc3e8d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2008-07-23  Ian Lance Taylor  <iant@google.com>
+2008-07-24  Kai Tietz  <kai.tietz@onevision.com>
+
+	* config/i386/i386.c (get_dllimport_decl): Treat user_label_prefix for
+	imp symbol extension.
+
+        2008-07-23  Ian Lance Taylor  <iant@google.com>
 
 	* tree-vrp.c (infer_value_range): Ignore asm statements when
 	looking for memory accesses for -fdelete-null-pointer-checks.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index fbe4bb6b227..b814a42855b 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -9123,7 +9123,8 @@ get_dllimport_decl (tree decl)
 
   name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
   name = targetm.strip_name_encoding (name);
-  prefix = name[0] == FASTCALL_PREFIX  ?  "*__imp_": "*__imp__";
+  prefix = name[0] == FASTCALL_PREFIX || user_label_prefix[0] == 0
+    ? "*__imp_" : "*__imp__";
   namelen = strlen (name);
   prefixlen = strlen (prefix);
   imp_name = (char *) alloca (namelen + prefixlen + 1);