diff --git a/share/completions/base64.fish b/share/completions/base64.fish
new file mode 100644
index 000000000..d7488c69d
--- /dev/null
+++ b/share/completions/base64.fish
@@ -0,0 +1,5 @@
+complete -c base64 -l decode -s d -d "Decode data"
+complete -c base64 -l ignore-garbage -s i -d "When decoding, ignore non-alphabet characters"
+complete -c base64 -l wrap -s w -x -d "Wrap encoded line after given number of caracters (default 76)"
+complete -c base64 -l help -d "Display help"
+complete -c base64 -l version -d "Display version"