diff --git a/bash_completion b/bash_completion
index b1b941c2..c5b77053 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1688,7 +1688,7 @@ _longopt()
     fi
 }
 # makeinfo and texi2dvi are defined elsewhere.
-for i in a2ps awk bash bc bison cat colordiff cp csplit \
+for i in a2ps awk base64 bash bc bison cat colordiff cp csplit \
     cut date df diff dir du enscript env expand fmt fold gperf gprof \
     grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
     mv netstat nl nm objcopy objdump od paste patch pr ptx readelf rm rmdir \
diff --git a/test/completion/base64.exp b/test/completion/base64.exp
new file mode 100644
index 00000000..2f5f6122
--- /dev/null
+++ b/test/completion/base64.exp
@@ -0,0 +1 @@
+assert_source_completions base64
diff --git a/test/lib/completions/base64.exp b/test/lib/completions/base64.exp
new file mode 100644
index 00000000..1f3f35cf
--- /dev/null
+++ b/test/lib/completions/base64.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "base64 "
+
+
+sync_after_int
+
+
+teardown