diff --git a/completions/.gitignore b/completions/.gitignore
index 23092b1b..9dfbe916 100644
--- a/completions/.gitignore
+++ b/completions/.gitignore
@@ -50,6 +50,7 @@ gnumake
 gpc
 hciattach
 hciconfig
+hd
 host
 hping
 hping3
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 96e3f71b..479cc098 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -120,6 +120,7 @@ bashcomp_DATA = a2x \
 		gzip \
 		hcitool \
 		hddtemp \
+		hexdump \
 		hid2hci \
 		hping2 \
 		htop \
@@ -430,6 +431,7 @@ CLEANFILES = \
 	gpc \
 	hciattach \
 	hciconfig \
+	hd \
 	host \
 	hping \
 	hping3 \
@@ -663,6 +665,10 @@ symlinks: $(targetdir) $(DATA)
 		rm -f $(targetdir)/$$file && \
 			$(LN_S) hcitool $(targetdir)/$$file ; \
 	done
+	for file in hd ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) hexdump $(targetdir)/$$file ; \
+	done
 	for file in hping hping3 ; do \
 		rm -f $(targetdir)/$$file && \
 			$(LN_S) hping2 $(targetdir)/$$file ; \
diff --git a/completions/hexdump b/completions/hexdump
new file mode 100644
index 00000000..d043f8b8
--- /dev/null
+++ b/completions/hexdump
@@ -0,0 +1,29 @@
+# hexdump(1) completion                                    -*- shell-script -*-
+
+_hexdump()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -V|-e|-n|-s)
+            return
+            ;;
+        -f)
+            _filedir
+            return
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        local opts="$( _parse_help "$1" )"
+        [[ $opts ]] || opts="$( _parse_usage "$1" )"
+        COMPREPLY=( $( compgen -W "$opts" -- "$cur" ) )
+        return
+    fi
+
+    _filedir
+} &&
+complete -F _hexdump hexdump
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/hexdump.exp b/test/completion/hexdump.exp
new file mode 100644
index 00000000..7bdc0d36
--- /dev/null
+++ b/test/completion/hexdump.exp
@@ -0,0 +1 @@
+assert_source_completions hexdump
diff --git a/test/lib/completions/hexdump.exp b/test/lib/completions/hexdump.exp
new file mode 100644
index 00000000..e3447482
--- /dev/null
+++ b/test/lib/completions/hexdump.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "hexdump -"
+sync_after_int
+
+
+teardown