diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fa8be5db688..aea1ae6a0bc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-11  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* gnu/gcj/runtime/NameFinder.java (lookup): If exec'ing addr2line
+	fails, don't try again.
+	(use_addr2line): Field no longer final.
+
 2006-05-11  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* gnu/gcj/runtime/NameFinder.java (blacklist): New static field.
diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java
index bfc3e25d345..e43886feb4c 100644
--- a/libjava/gnu/gcj/runtime/NameFinder.java
+++ b/libjava/gnu/gcj/runtime/NameFinder.java
@@ -62,7 +62,7 @@ public class NameFinder
    */
   private static Set blacklist = Collections.synchronizedSet(new HashSet());
 
-  private static final boolean use_addr2line
+  private static boolean use_addr2line
           = Boolean.valueOf(System.getProperty
                 ("gnu.gcj.runtime.NameFinder.use_addr2line", "true")
             ).booleanValue();
@@ -166,8 +166,11 @@ public class NameFinder
       procs.put(file, addr2line);
       }
     
-    if (addr2line.proc == null)      
-      return;
+    if (addr2line.proc == null)
+      {
+        use_addr2line = false;
+	return;
+      }
     
     String hexAddr = "0x" + Long.toHexString(addr);
     String name;