diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5bce092a7e..d1757dcfc8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-23  Christopher Faylor  <me.gdb.changelog@cgf.cx>
+
+	* win32-nat.c (safe_symbol_file_add_stub): Remove unused variable.
+	(do_initial_win32_stuff): Fix problem with inability to set breakpoints
+	when first loading DLL with "dll" command.
+
 2008-06-19  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* gnu-nat.c (proc_string): Use capital T for "Thread".
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 1478a96f2a..00929aa71f 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -556,8 +556,6 @@ static int
 safe_symbol_file_add_stub (void *argv)
 {
 #define p ((struct safe_symbol_file_add_args *) argv)
-  struct so_list *so = &solib_start;
-
   p->ret = symbol_file_add (p->name, p->from_tty, p->addrs, p->mainline, p->flags);
   return !!p->ret;
 #undef p
@@ -1525,6 +1523,7 @@ do_initial_win32_stuff (DWORD pid)
   terminal_init_inferior_with_pgrp (pid);
   target_terminal_inferior ();
 
+  stop_soon = STOP_QUIETLY;
   while (1)
     {
       stop_after_trap = 1;
@@ -1534,6 +1533,8 @@ do_initial_win32_stuff (DWORD pid)
       else
 	break;
     }
+
+  stop_soon = NO_STOP_QUIETLY;
   stop_after_trap = 0;
   return;
 }
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 1478a96f2a..00929aa71f 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -556,8 +556,6 @@ static int
 safe_symbol_file_add_stub (void *argv)
 {
 #define p ((struct safe_symbol_file_add_args *) argv)
-  struct so_list *so = &solib_start;
-
   p->ret = symbol_file_add (p->name, p->from_tty, p->addrs, p->mainline, p->flags);
   return !!p->ret;
 #undef p
@@ -1525,6 +1523,7 @@ do_initial_win32_stuff (DWORD pid)
   terminal_init_inferior_with_pgrp (pid);
   target_terminal_inferior ();
 
+  stop_soon = STOP_QUIETLY;
   while (1)
     {
       stop_after_trap = 1;
@@ -1534,6 +1533,8 @@ do_initial_win32_stuff (DWORD pid)
       else
 	break;
     }
+
+  stop_soon = NO_STOP_QUIETLY;
   stop_after_trap = 0;
   return;
 }