diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d06c21625fd..4c49f85cb3b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-12  Christopher Faylor  <cgf@redhat.com>
+
+	* win32-nat.c (safe_symbol_file_add_stub): Properly initialize linked
+	list pointer to beginning rather than one beyond beginning.
+
 2001-10-12  Daniel Jacobowitz  <drow@mvista.com>
 
 	* symtab.h (struct block): (ALL_BLOCK_SYMBOLS): New macro.
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 82d4c946608..00c9933e70e 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -450,7 +450,7 @@ static int
 safe_symbol_file_add_stub (void *argv)
 {
 #define p ((struct safe_symbol_file_add_args *)argv)
-  struct so_stuff *so = solib_start.next;
+  struct so_stuff *so = &solib_start;
 
   while ((so = so->next))
     if (strcasecmp (so->name, p->name) == 0)
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 82d4c946608..00c9933e70e 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -450,7 +450,7 @@ static int
 safe_symbol_file_add_stub (void *argv)
 {
 #define p ((struct safe_symbol_file_add_args *)argv)
-  struct so_stuff *so = solib_start.next;
+  struct so_stuff *so = &solib_start;
 
   while ((so = so->next))
     if (strcasecmp (so->name, p->name) == 0)