diff --git a/etc/key_mapping b/etc/key_mapping
index 0d2abbf79d213888a15c0fa7e28d24f457a9496d..3a7f179dffeebd927e0c0aa9e91e3204e155cc4f 100644
--- a/etc/key_mapping
+++ b/etc/key_mapping
@@ -24,3 +24,6 @@ modified_amino_acid_feature                misc_feature    note=modified_amino_a
 snRNA                                      ncRNA           ncRNA_class=snRNA
 snoRNA                                     ncRNA           ncRNA_class=snoRNA
 nucleotide_match                           misc_feature    note=nucleotide_match
+uORF                                       misc_feature    note=uORF
+sORF                                       misc_feature    note=sORF
+tnaORF                                     misc_feature    note=tnaORF
diff --git a/etc/options b/etc/options
index 4ab7ec29e73c264bda11b5ebe6a80242f29cd3ff..8a2c2aea0d35c00040038e683fea40e8269ffa04 100644
--- a/etc/options
+++ b/etc/options
@@ -423,7 +423,7 @@ extra_keys = \
     TMM signalP
 
 # this list is added to the keys from the feature_keys_gff file
-extra_keys_gff = CDS spliced_leader_RNA sequence_variant fasta_record
+extra_keys_gff = CDS uORF sORF tnaORF spliced_leader_RNA sequence_variant fasta_record
 
 # Names of qualifiers to search when attempting to find the primary or display
 # name of a gene.  These qualifiers names are searched in order when looking