diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 070a60720..cd178c715 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-16  Don Allingham  <don@gramps-project.org>
+	* src/WriteGedcom.py: used 'replace' mode on iso-8859-1 string
+	encoding conversion
+
 2005-05-16  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/ReadGedcom.py (parse_trailer): Catch EOF to warn about premature
 	EOF only once; Always close file; (parse_record): Properly catch
diff --git a/gramps2/src/WriteGedcom.py b/gramps2/src/WriteGedcom.py
index a088dad80..bf927eb69 100644
--- a/gramps2/src/WriteGedcom.py
+++ b/gramps2/src/WriteGedcom.py
@@ -59,7 +59,7 @@ def keep_utf8(s):
     return s
 
 def iso8859(s):
-    return s.encode('iso-8859-1')
+    return s.encode('iso-8859-1','replace')
 
 #-------------------------------------------------------------------------
 #