2 files changed, 16 insertions, 2 deletions
diff --git a/libjava/gnu/gcj/convert/BytesToUnicode.java b/libjava/gnu/gcj/convert/BytesToUnicode.java
index d80ed6570d8..de116dd1396 100644
--- a/libjava/gnu/gcj/convert/BytesToUnicode.java
+++ b/libjava/gnu/gcj/convert/BytesToUnicode.java
@@ -52,7 +52,14 @@ public abstract class BytesToUnicode extends IOConverter
       }
     catch (Throwable ex)
       {
-	return new Input_8859_1();
+	try
+	  {
+	    return new Input_iconv (System.getProperty ("file.encoding"));
+	  }
+	catch (Throwable ex2)
+	  {
+	    return new Input_8859_1();
+	  }
       }
   }
 
diff --git a/libjava/gnu/gcj/convert/UnicodeToBytes.java b/libjava/gnu/gcj/convert/UnicodeToBytes.java
index 1ba6ddf8065..dce7797fbaf 100644
--- a/libjava/gnu/gcj/convert/UnicodeToBytes.java
+++ b/libjava/gnu/gcj/convert/UnicodeToBytes.java
@@ -50,7 +50,14 @@ public abstract class UnicodeToBytes extends IOConverter
       }
     catch (Throwable ex)
       {
-	return new Output_8859_1();
+	try
+	  {
+	    return new Output_iconv (System.getProperty ("file.encoding"));
+	  }
+	catch (Throwable ex2)
+	  {
+	    return new Output_8859_1();
+	  }
       }
   }