diff --git a/tools/funannotate/funannotate_annotate.xml b/tools/funannotate/funannotate_annotate.xml
index 51b6c290044..109cfc8ec75 100644
--- a/tools/funannotate/funannotate_annotate.xml
+++ b/tools/funannotate/funannotate_annotate.xml
@@ -8,6 +8,12 @@
     </requirements>
     <version_command>funannotate check --show-versions</version_command>
     <command><![CDATA[
+## Needed by some subprocess invoked internally
+## https://github.com/nextgenusfs/funannotate/issues/905
+export FUNANNOTATE_DB='$database.fields.path'
+
+&&
+
 funannotate annotate
 
 #if $input.input_type == 'gbk'
diff --git a/tools/funannotate/macros.xml b/tools/funannotate/macros.xml
index 9c83e89447a..f59652e28c4 100644
--- a/tools/funannotate/macros.xml
+++ b/tools/funannotate/macros.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <macros>
     <token name="@TOOL_VERSION@">1.8.15</token>
-    <token name="@VERSION_SUFFIX@">0</token>
+    <token name="@VERSION_SUFFIX@">1</token>
 
     <xml name="requirements">
         <requirement type="package" version="@TOOL_VERSION@">funannotate</requirement>