diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index ab10e486c2..873d9c9a9a 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-15  Kai Tietz <kai.tietz@onevision.com>
+
+	* dllwrap.c (main): Make sure is_leading_underscore
+	gets initialized with correct default.
+
 2010-07-05  Alan Modra  <amodra@gmail.com>
 
 	* readelf.c (uncompress_section_contents): Avoid gcc-4.6 warning.
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index c807f49c27..4e48f3e39d 100644
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -855,6 +855,9 @@ Creating one, but that may not be what you want"));
   else
     which_cpu = UNKNOWN_CPU;
 
+  if (is_leading_underscore == -1)
+    is_leading_underscore = (which_cpu != X64_CPU && which_cpu != ARM_CPU);
+
   /* Re-create the command lines as a string, taking care to quote stuff.  */
   dlltool_cmdline = dyn_string_new (cmdline_len);
   if (verbose)