diff --git a/Makefile b/Makefile
index 06bf95e..44ff6e3 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ install:
 	mkdir -p $(MANDIR)/man1
 	cp sshfs-mapper $(BINDIR)/
 	cat sshfs-mapper.1 | gzip > $(MANDIR)/man1/sshfs-mapper.1.gz
+	install -D -o root -g root -m 644 $(CURDIR)/sshfs-mapper.completion $(DESTDIR)/etc/bash_completion.d/sshfs-mapper
 	#
 	mkdir -p $(CONFDIR)
 	for f in `ls conf`; do \
diff --git a/sshfs-mapper.completion b/sshfs-mapper.completion
new file mode 100644
index 0000000..d365127
--- /dev/null
+++ b/sshfs-mapper.completion
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+_sshfsmapper_opts()
+{
+	local cur prev sshfsmapper_opts
+
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+	sshfsmapper_opts='-s -h -i -l -u -a'
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W "$sshfsmapper_opts" -- $cur ) )
+	else
+		if [[ "$prev" == -s ]]; then
+			COMPREPLY=( $( sshfs-mapper -l 2> /dev/null ) )
+		else	
+			COMPREPLY=( $( compgen -W "$sshfsmapper_opts" -- $cur ) )
+		fi
+	fi
+}
+
+complete -F _sshfsmapper_opts $default sshfs-mapper