diff --git a/.config/fish/completions/jrnl.fish b/.config/fish/completions/jrnl.fish
new file mode 100644
index 00000000..1edaf21b
--- /dev/null
+++ b/.config/fish/completions/jrnl.fish
@@ -0,0 +1,11 @@
+complete -c jrnl -s h -l help -d 'Print help'
+complete -c jrnl -s e -l edit-template -d 'Edit the journal entry template'
+complete -c jrnl -s d -l dir -d 'Set the journal directory' -r
+function __jrnl_dir
+    if set -q jrnl_directory
+        echo $jrnl_directory
+    else
+        echo ~/jrnl
+    end
+end
+complete -c jrnl -s t -l template -d 'Set the template file' -r
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 335c0d50..c7df270c 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -5,7 +5,7 @@ SETUVAR --export XDG_CONFIG_HOME:/home/fic/\x2econfig
 SETUVAR Z_DATA_DIR:/home/fic/\x2elocal/share/z
 SETUVAR __fish_initialized:3800
 SETUVAR _fisher_danhper_2F_fish_2D_ssh_2D_agent_files:\x7e/\x2econfig/fish/functions/__ssh_agent_is_started\x2efish\x1e\x7e/\x2econfig/fish/functions/__ssh_agent_start\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fish\x2dssh\x2dagent\x2efish
-SETUVAR _fisher_ficcdaf_2F_jrnl_2E_fish_files:\x7e/\x2econfig/fish/functions/jrnl\x2efish
+SETUVAR _fisher_ficcdaf_2F_jrnl_2E_fish_files:\x7e/\x2econfig/fish/functions/jrnl\x2efish\x1e\x7e/\x2econfig/fish/completions/jrnl\x2efish
 SETUVAR _fisher_franciscolourenco_2F_done_files:\x7e/\x2econfig/fish/conf\x2ed/done\x2efish
 SETUVAR _fisher_jorgebucaran_2F_autopair_2E_fish_files:\x7e/\x2econfig/fish/functions/_autopair_backspace\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_left\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_right\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_same\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_tab\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/autopair\x2efish
 SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish