diff --git a/ChangeLog b/ChangeLog
index 2f3c3ddcc..ea9be13e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2003-07-07  Tim Waugh  <twaugh@redhat.com>
-	* src/plugins/WriteGedcom.py: Fix GEDCOM export.
+	* src/plugins/WriteGedcom.py: Fix GEDCOM export.  Fixed date
+	construction logic to handle datestrs.
 
 2003-07-06  Don Allingham  <dallingham@users.sourceforge.net>
 	* gramps.sh.in: Don't override an existing PYTHONPATH environment
diff --git a/src/plugins/WriteGedcom.py b/src/plugins/WriteGedcom.py
index 1fe8681e0..4850f9e8b 100644
--- a/src/plugins/WriteGedcom.py
+++ b/src/plugins/WriteGedcom.py
@@ -1017,11 +1017,10 @@ class GedcomWriter:
 
     def print_date(self,prefix,date):
         start = date.get_start_date()
-        if date.isEmpty():
-            val = date.getText()
-            if val:
-                self.writeln("%s %s" % (prefix,self.cnvtxt(val)))
-        else:
+        val = date.getText()
+        if val:
+            self.writeln("%s %s" % (prefix,self.cnvtxt(val)))
+        elif not date.isEmpty ():
             if date.isRange():
                 val = "FROM %s TO %s" % (make_date(start),
                                          make_date(date.get_stop_date()))