diff --git a/src/plugins/export/ExportGedcom.py b/src/plugins/export/ExportGedcom.py
index c9a95d464..9bd3888e8 100644
--- a/src/plugins/export/ExportGedcom.py
+++ b/src/plugins/export/ExportGedcom.py
@@ -634,7 +634,7 @@ class GedcomWriter(UpdateCallback):
             key = str(attr.get_type())
             value = attr.get_value().strip().replace('\r', ' ')
             
-            if key in ("AFN", "RFN", "REFN", "_UID"):
+            if key in ("AFN", "RFN", "REFN", "_UID", "_FSFTID"):
                 self.__writeln(1, key, value)
                 continue
 
@@ -876,10 +876,11 @@ class GedcomWriter(UpdateCallback):
             
             attr_type = int(attr.get_type())
             name = libgedcom.FAMILYCONSTANTATTRIBUTES.get(attr_type)
+            key = str(attr.get_type())
             value = attr.get_value().replace('\r', ' ')
 
-            if attr_type in ("AFN", "RFN", "REFN", "_UID"):
-                self.__writeln(1, attr_type, value)
+            if key in ("AFN", "RFN", "REFN", "_UID"):
+                self.__writeln(1, key, value)
                 continue
             
             if name and name.strip():
@@ -887,7 +888,7 @@ class GedcomWriter(UpdateCallback):
                 continue
             else:
                 self.__writeln(1, 'FACT', value)
-                self.__writeln(2, 'TYPE', str(attr.get_type()))
+                self.__writeln(2, 'TYPE', key)
 
             self.__note_references(attr.get_note_list(), level+1)
             self.__source_references(attr.get_citation_list(), 
diff --git a/src/plugins/lib/libgedcom.py b/src/plugins/lib/libgedcom.py
index 465d50977..483eb4e1f 100644
--- a/src/plugins/lib/libgedcom.py
+++ b/src/plugins/lib/libgedcom.py
@@ -258,6 +258,7 @@ TOKEN_ROLE = 127
 TOKEN__MAR = 128
 TOKEN__MARN = 129
 TOKEN__ADPN = 130
+TOKEN__FSFTID = 131
 
 TOKENS = {
     "HEAD"         : TOKEN_HEAD,    "MEDI"         : TOKEN_MEDI,
@@ -363,7 +364,7 @@ TOKENS = {
     "EMAI"           : TOKEN_EMAIL, "WWW"           : TOKEN_WWW,
     "_URL"           : TOKEN_URL,   "URL"           : TOKEN_URL,
     "_MAR"           : TOKEN__MAR,  "_MARN"         : TOKEN__MARN,
-    "_ADPN"          : TOKEN__ADPN
+    "_ADPN"          : TOKEN__ADPN, "_FSFTID"       : TOKEN__FSFTID,
 }
 
 ADOPT_NONE         = 0
@@ -991,6 +992,7 @@ _MAP_DATA = {
     TOKEN__STAT   : GedLine.calc_attr,
     TOKEN__UID    : GedLine.calc_attr,
     TOKEN_AFN     : GedLine.calc_attr,
+    TOKEN__FSFTID : GedLine.calc_attr,
     }
 
 #-------------------------------------------------------------------------