diff --git a/completions/Makefile.am b/completions/Makefile.am
index ba3cfb03..4773a726 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -284,6 +284,7 @@ bashcomp_DATA = a2x \
 		snownews \
 		sqlite3 \
 		ssh \
+		ssh-add \
 		ssh-copy-id \
 		sshfs \
 		sshmitm \
diff --git a/completions/ssh-add b/completions/ssh-add
new file mode 100644
index 00000000..1d563688
--- /dev/null
+++ b/completions/ssh-add
@@ -0,0 +1,23 @@
+# ssh-add(1) completion                                    -*- shell-script -*-
+
+_ssh_add()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -t|-s|-e)
+            return
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" -? )' -- "$cur" ) )
+        return
+    fi
+
+    _filedir
+} &&
+complete -F _ssh_add ssh-add
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/ssh-add.exp b/test/completion/ssh-add.exp
new file mode 100644
index 00000000..03035cf7
--- /dev/null
+++ b/test/completion/ssh-add.exp
@@ -0,0 +1 @@
+assert_source_completions ssh-add
diff --git a/test/lib/completions/ssh-add.exp b/test/lib/completions/ssh-add.exp
new file mode 100644
index 00000000..2fb2a9b4
--- /dev/null
+++ b/test/lib/completions/ssh-add.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ssh-add "
+
+
+sync_after_int
+
+
+teardown