diff --git a/ChangeLog b/ChangeLog
index 6ff7ea8aa..2f3c3ddcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003-07-07  Tim Waugh  <twaugh@redhat.com>
+	* src/plugins/WriteGedcom.py: Fix GEDCOM export.
+
 2003-07-06  Don Allingham  <dallingham@users.sourceforge.net>
 	* gramps.sh.in: Don't override an existing PYTHONPATH environment
 	variable
diff --git a/src/plugins/WriteGedcom.py b/src/plugins/WriteGedcom.py
index 27dde25f7..1fe8681e0 100644
--- a/src/plugins/WriteGedcom.py
+++ b/src/plugins/WriteGedcom.py
@@ -1032,8 +1032,9 @@ class GedcomWriter:
     def write_person_name(self,name,nick):
         firstName = self.cnvtxt(name.getFirstName())
         surName = self.cnvtxt(name.getSurname())
+        surName = surName.replace('/','?')
         surPref = self.cnvtxt(name.getSurnamePrefix())
-        surName = surPref.replace('/','?')
+        surPref = surPref.replace('/','?')
         suffix = self.cnvtxt(name.getSuffix())
         title = self.cnvtxt(name.getTitle())
         if suffix == "":