diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index d1cbc9648..e1293f96a 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-28  Tim Waugh  <twaugh@redhat.com>
+	* src/plugins/WriteGedcom.py: Convert line end string to chosen
+	encoding (prevents traceback).
+
 2003-06-28  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/plugins/WriteGedcom.py: support different end of line characters
 	* src/GedcomInfo.py: support different end of line characters
diff --git a/gramps2/src/plugins/WriteGedcom.py b/gramps2/src/plugins/WriteGedcom.py
index 59c192fe6..f6599d965 100644
--- a/gramps2/src/plugins/WriteGedcom.py
+++ b/gramps2/src/plugins/WriteGedcom.py
@@ -437,7 +437,6 @@ class GedcomWriter:
         act_tgt = self.target_menu.get_active()
 
         self.target_ged =  act_tgt.get_data("data")
-        self.nl = self.target_ged.get_endl()
 
         self.dest = self.target_ged.get_dest()
         self.adopt = self.target_ged.get_adopt()
@@ -456,6 +455,7 @@ class GedcomWriter:
         else:
             self.cnvtxt = keep_utf8
 
+        self.nl = self.cnvtxt(self.target_ged.get_endl())
         name = self.topDialog.get_widget("filename").get_text()
 
         if cfilter == None: