diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 64917f3f3fca38072d59d213e4d79e9db5fa5140..7a467f5cb43c0c5b8405ad0a0ff25f41cde80605 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-23  Per Bothner  <per@bothner.com>
+
+	* java/lang/Throwable.java (CPlusPlusDemangler):  Pass -s java to
+	c++filt to select java-style output.
+
 2001-02-22  Bryce McKinlay  <bryce@albatross.co.nz>
 
 	Fix for PR java/2040:
diff --git a/libjava/java/lang/Throwable.java b/libjava/java/lang/Throwable.java
index 4aa21399c5ab445b259e7bad21aacb1824ba0803..5c330fe315e0dd05e624318e7c565beb1eabffcd 100644
--- a/libjava/java/lang/Throwable.java
+++ b/libjava/java/lang/Throwable.java
@@ -57,7 +57,7 @@ class CPlusPlusDemangler extends OutputStream
   CPlusPlusDemangler (PrintWriter writer) throws IOException
   {
     p = writer;
-    proc = Runtime.getRuntime ().exec ("c++filt");
+    proc = Runtime.getRuntime ().exec ("c++filt -s java");
     procOut = proc.getOutputStream ();
     procIn = proc.getInputStream ();
   }