diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d3bdbccff3..e349f77951 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* objfiles.c (init_entry_point_info): Handle shared libraries.
+
 2008-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* arm-tdep.c (arm_prologue_this_id): Compare pc, not func, to
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index b7d578f956..0234dcec7d 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -259,6 +259,12 @@ init_entry_point_info (struct objfile *objfile)
          the startup file because it contains the entry point.  */
       objfile->ei.entry_point = bfd_get_start_address (objfile->obfd);
     }
+  else if (bfd_get_file_flags (objfile->obfd) & DYNAMIC
+	   && bfd_get_start_address (objfile->obfd) != 0)
+    /* Some shared libraries may have entry points set and be
+       runnable.  There's no clear way to indicate this, so just check
+       for values other than zero.  */
+    objfile->ei.entry_point = bfd_get_start_address (objfile->obfd);    
   else
     {
       /* Examination of non-executable.o files.  Short-circuit this stuff.  */