diff --git a/ontologies.Makefile b/ontologies.Makefile
index 665308c..970c59f 100644
--- a/ontologies.Makefile
+++ b/ontologies.Makefile
@@ -1040,7 +1040,18 @@ download/gist.owl: STAMP
 .PRECIOUS: download/gist.owl
 
 db/gist.owl: download/gist.owl
-	cp $< $@
+	robot merge -i $< -o $@
+
+
+download/gistBFO.owl: STAMP
+	curl -L -s https://w3id.org/semanticarts/ontology/gistBFO > $@.tmp
+	sha256sum -b $@.tmp > $@.sha256
+	mv $@.tmp $@
+
+.PRECIOUS: download/gistBFO.owl
+
+db/gistBFO.owl: download/gistBFO.owl
+	robot merge -i $< -o $@
 
 
 download/fhkb.owl: STAMP
@@ -1548,4 +1559,4 @@ download/%.owl: STAMP
 db/%.owl: download/%.owl
 	robot merge -i $< -o $@
 
-EXTRA_ONTOLOGIES = swo chiro pcl chemessence ogco ncit fma maxo foodon chebiplus msio chemrof deb matpo panet phenx pride sosa emi npc modl phenio comploinc hba mba dmba dhba pba bero aio reacto xsmo bcio sio icd10who icd11f ordo gard icd10cm omim mondo-ingest oeo envthes wifire taxslim goldterms sdgio kin metpo d3o biovoices omop comet cco occo iof upa go go-lego go-amigo neo bao orcid ror cpont biolink biopax enanomapper mlo ito chemont molgenie cso obiws biopragmatics-reactome reactome-hs reactome-mm efo hcao hpinternational edam chr sweetAll oboe-core oboe-standards lov schema-dot-org prov dtype vaem qudtunit quantitykind cellosaurus cosmo gist fhkb dbpendiaont uberoncm co_324 ppeo interpro pfam hgnc.genegroup hgnc sgd gtdb eccode uniprot uniprot.ptm credit rhea swisslipid drugbank drugcentral complexportal wikipathways pathbank kegg.genome drugmechdb rxnorm vccf ontobiotope nando ecso enigma_context cbo ontie pain como ecosim bervo valuesets nmdc_schema mixs kgcl fibo bfo2020 bfo2020_core bfo2020_notime bfo2020_time
+EXTRA_ONTOLOGIES = swo chiro pcl chemessence ogco ncit fma maxo foodon chebiplus msio chemrof deb matpo panet phenx pride sosa emi npc modl phenio comploinc hba mba dmba dhba pba bero aio reacto xsmo bcio sio icd10who icd11f ordo gard icd10cm omim mondo-ingest oeo envthes wifire taxslim goldterms sdgio kin metpo d3o biovoices omop comet cco occo iof upa go go-lego go-amigo neo bao orcid ror cpont biolink biopax enanomapper mlo ito chemont molgenie cso obiws biopragmatics-reactome reactome-hs reactome-mm efo hcao hpinternational edam chr sweetAll oboe-core oboe-standards lov schema-dot-org prov dtype vaem qudtunit quantitykind cellosaurus cosmo gist gistBFO fhkb dbpendiaont uberoncm co_324 ppeo interpro pfam hgnc.genegroup hgnc sgd gtdb eccode uniprot uniprot.ptm credit rhea swisslipid drugbank drugcentral complexportal wikipathways pathbank kegg.genome drugmechdb rxnorm vccf ontobiotope nando ecso enigma_context cbo ontie pain como ecosim bervo valuesets nmdc_schema mixs kgcl fibo bfo2020 bfo2020_core bfo2020_notime bfo2020_time
diff --git a/src/semsql/builder/prefixes/prefixes.csv b/src/semsql/builder/prefixes/prefixes.csv
index 9377b7e..7f35013 100644
--- a/src/semsql/builder/prefixes/prefixes.csv
+++ b/src/semsql/builder/prefixes/prefixes.csv
@@ -173,6 +173,7 @@ quantitykind,http://qudt.org/vocab/quantitykind/
 cellosaurus,http://purl.obolibrary.org/obo/Cellosaurus#CVCL_
 gist,https://w3id.org/semanticarts/ns/ontology/gist/
 gistd,https://w3id.org/semanticarts/ns/data/gist/
+gist,https://w3id.org/semanticarts/ns/ontology/gist/
 fhkb,http://owl.cs.manchester.ac.uk/tutorials/fhkb#
 dbpediaont,http://dbpedia.org/ontology/
 dbpedia,http://dbpedia.org/
diff --git a/src/semsql/builder/prefixes/prefixes_local.csv b/src/semsql/builder/prefixes/prefixes_local.csv
index e0b328e..27fa00c 100644
--- a/src/semsql/builder/prefixes/prefixes_local.csv
+++ b/src/semsql/builder/prefixes/prefixes_local.csv
@@ -110,6 +110,7 @@ quantitykind,http://qudt.org/vocab/quantitykind/
 cellosaurus,http://purl.obolibrary.org/obo/Cellosaurus#CVCL_
 gist,https://w3id.org/semanticarts/ns/ontology/gist/
 gistd,https://w3id.org/semanticarts/ns/data/gist/
+gist,https://w3id.org/semanticarts/ns/ontology/gist/
 fhkb,http://owl.cs.manchester.ac.uk/tutorials/fhkb#
 dbpediaont,http://dbpedia.org/ontology/
 dbpedia,http://dbpedia.org/
diff --git a/src/semsql/builder/registry/ontologies.yaml b/src/semsql/builder/registry/ontologies.yaml
index 908bc3c..d3199d2 100644
--- a/src/semsql/builder/registry/ontologies.yaml
+++ b/src/semsql/builder/registry/ontologies.yaml
@@ -442,9 +442,17 @@ ontologies:
     has_imports: true
   gist:
     url: https://w3id.org/semanticarts/ontology/gistCore
+    # gist.owl contains DTD elements, rdftab doesn't like this
+    build_command: "robot merge -i $< -o $@"
     prefixmap:
       gist: https://w3id.org/semanticarts/ns/ontology/gist/
       gistd: https://w3id.org/semanticarts/ns/data/gist/
+  gistBFO:
+    url: https://w3id.org/semanticarts/ontology/gistBFO
+    # merge import closure
+    build_command: "robot merge -i $< -o $@"
+    prefixmap:
+      gist: https://w3id.org/semanticarts/ns/ontology/gist/    
   fhkb:
     prefixmap:
       fhkb: http://owl.cs.manchester.ac.uk/tutorials/fhkb#