diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2d92ef91dd..6bc0346f73 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-18  Mark Kettenis  <kettenis@gnu.org>
 
+	* infcall.c (find_function_addr): Add FUNCTION_START_OFFSET to
+	return value.
+
 	Based on a patch from Brian Ford <ford@vss.fsi.com>:
 	* i386-tdep.c: Correct register numbering scheme comments
 	throughout.
diff --git a/gdb/infcall.c b/gdb/infcall.c
index b10f8071da..3034bc42bc 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -206,7 +206,7 @@ find_function_addr (struct value *function, struct type **retval_type)
     error ("Invalid data type for function to be called.");
 
   *retval_type = value_type;
-  return funaddr;
+  return funaddr + FUNCTION_START_OFFSET;
 }
 
 /* Call breakpoint_auto_delete on the current contents of the bpstat