diff --git a/fish/config.fish b/fish/config.fish
index 32e6e58..0ea77d8 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -23,11 +23,6 @@ set -g fish_color_valid_path normal
 set -g fish_color_vcs 43d696
 set -g fish_color_vcs_braces 29bc7d
 
-set -g _fish_abbr_fl fossil
-set -g _fish_abbr_flc fossil changes --differ
-set -g _fish_abbr_gpg gpg2
-set -g _fish_abbr_vi vim
-
 test -n "$XDG_CONFIG_HOME"
 or set -x XDG_CONFIG_HOME $HOME/.config
 test -n "$XDG_CACHE_HOME"
diff --git a/fish/functions/fl.fish b/fish/functions/fl.fish
new file mode 100644
index 0000000..133c9f1
--- /dev/null
+++ b/fish/functions/fl.fish
@@ -0,0 +1,3 @@
+function fl --wraps=fossil
+    command fossil $argv
+end
diff --git a/fish/functions/flc.fish b/fish/functions/flc.fish
new file mode 100644
index 0000000..8d898cf
--- /dev/null
+++ b/fish/functions/flc.fish
@@ -0,0 +1,3 @@
+function flc --wraps='fossil changes --differ'
+    command fossil changes --differ $argv
+end
diff --git a/fish/functions/fld.fish b/fish/functions/fld.fish
index a612b5f..d25ffbb 100644
--- a/fish/functions/fld.fish
+++ b/fish/functions/fld.fish
@@ -1,3 +1,3 @@
-function fld
-    fossil diff $argv -N | colordiff | less -FRX
+function fld --wraps 'fossil diff'
+    command fossil diff $argv -N | colordiff | less -FRX
 end
diff --git a/fish/functions/gpg.fish b/fish/functions/gpg.fish
new file mode 100644
index 0000000..f84c177
--- /dev/null
+++ b/fish/functions/gpg.fish
@@ -0,0 +1,3 @@
+function gpg --wraps=gpg2
+    command gpg2 $argv
+end
diff --git a/fish/functions/vi.fish b/fish/functions/vi.fish
new file mode 100644
index 0000000..27b8033
--- /dev/null
+++ b/fish/functions/vi.fish
@@ -0,0 +1,3 @@
+function vi --wraps=vim
+    command vim $argv
+end