diff -Naur valgrind-2.0.0/coregrind/vg_include.h mod/coregrind/vg_include.h
--- valgrind-2.0.0/coregrind/vg_include.h	2003-10-02 15:24:37.000000000 -0500
+++ mod/coregrind/vg_include.h	2003-11-21 11:26:28.000000000 -0600
@@ -232,8 +232,10 @@
 /* Display gory details for the k'th most popular error.  default:
    Infinity. */
 extern Int   VG_(clo_dump_error);
-/* Number of parents of a backtrace.  Default: 8.  */
+/* Number of parents of a backtrace.  Default: 4.  */
 extern Int   VG_(clo_backtrace_size);
+/* Print addresses in backtrace output.  Default: Yes.  */
+extern Bool  VG_(clo_stack_addresses);
 /* Engage miscellaneous weird hacks needed for some progs. */
 extern Char* VG_(clo_weird_hacks);
 /* Should we run __libc_freeres at exit?  Sometimes causes crashes.
diff -Naur valgrind-2.0.0/coregrind/vg_main.c mod/coregrind/vg_main.c
--- valgrind-2.0.0/coregrind/vg_main.c	2003-10-04 19:02:43.000000000 -0500
+++ mod/coregrind/vg_main.c	2003-11-21 11:26:28.000000000 -0600
@@ -545,6 +545,7 @@
 ULong  VG_(clo_stop_after)     = 1000000000000000LL;
 Int    VG_(clo_dump_error)     = 0;
 Int    VG_(clo_backtrace_size) = 4;
+Bool   VG_(clo_stack_addresses)= True;
 Char*  VG_(clo_weird_hacks)    = NULL;
 Bool   VG_(clo_run_libc_freeres) = True;
 Bool   VG_(clo_chain_bb)       = True;
@@ -622,6 +623,7 @@
 "    --gen-suppressions=no|yes print suppressions for errors detected [no]\n"
 "    --demangle=no|yes         automatically demangle C++ names? [yes]\n"
 "    --num-callers=<number>    show <num> callers in stack traces [4]\n"
+"    --stack-addresses=no|yes  print addresses in stack trace output [yes]\n"
 "    --error-limit=no|yes      stop showing new errors if too many? [yes]\n"
 "    --trace-children=no|yes   Valgrind-ise child processes? [no]\n"
 "    --run-libc-freeres=no|yes Free up glibc memory at exit? [yes]\n"
@@ -1071,6 +1073,11 @@
             VG_(clo_backtrace_size) = VG_DEEPEST_BACKTRACE;
       }
 
+      else if (VG_CLO_STREQ(argv[i], "--stack-addresses=yes"))
+         VG_(clo_stack_addresses) = True;
+      else if (VG_CLO_STREQ(argv[i], "--stack-addresses=no"))
+         VG_(clo_stack_addresses) = False;
+
       else if (VG_(needs).command_line_options) {
          Bool ok = SK_(process_cmd_line_option)(argv[i]);
          if (!ok)
diff -Naur valgrind-2.0.0/coregrind/vg_symtab2.c mod/coregrind/vg_symtab2.c
--- valgrind-2.0.0/coregrind/vg_symtab2.c	2003-10-29 16:52:46.000000000 -0600
+++ mod/coregrind/vg_symtab2.c	2003-11-21 11:26:28.000000000 -0600
@@ -2647,8 +2647,10 @@
                                                &lineno);
       if (i == 0) APPEND("   at ") else APPEND("   by ");
       
-      VG_(sprintf)(ibuf,"0x%x: ", eip);
-      APPEND(ibuf);
+      if (VG_(clo_stack_addresses)) {
+         VG_(sprintf)(ibuf,"0x%x: ", eip);
+         APPEND(ibuf);
+      }
       if (know_fnname) { 
          APPEND(buf_fn);
          if (!know_srcloc && know_objname) {
diff -Naur valgrind-2.0.0/debian/changelog mod/debian/changelog
--- valgrind-2.0.0/debian/changelog	2003-11-21 11:25:38.000000000 -0600
+++ mod/debian/changelog	2003-11-21 11:27:08.000000000 -0600
@@ -1,3 +1,9 @@
+valgrind (1:2.0.0-3Custom1) unstable; urgency=low
+
+  * Add --stack-addresses=no|yes option.
+
+ -- Jason Kraftcheck <kraftche@cae.wisc.edu>  Fri, 21 Nov 2003 11:27:03 -0600
+
 valgrind (1:2.0.0-3) unstable; urgency=low
 
   * Renamed debian/patches files to the XX_name.dpatch scheme.