diff --git a/completions/Makefile.am b/completions/Makefile.am
index d7d512c4..929dc12a 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -55,6 +55,7 @@ bashcomp_DATA = abook \
 		gpg \
 		gpg2 \
 		gzip \
+		hddtemp \
 		heimdal \
 		hping2 \
 		htpasswd \
diff --git a/completions/hddtemp b/completions/hddtemp
new file mode 100644
index 00000000..3e9f8256
--- /dev/null
+++ b/completions/hddtemp
@@ -0,0 +1,46 @@
+# hddtemp(8) completion
+
+have hddtemp || return
+
+_hddtemp()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    case $prev in
+        -f|--file)
+            _filedir db
+            return
+            ;;
+        -l|--listen)
+            _ip_addresses
+            return
+            ;;
+        -u|--unit)
+            COMPREPLY=( $( compgen -W 'C F' -- "$cur" ) )
+            return
+            ;;
+        -p|--port|-s|--separator|-S|--syslog|-v|--version|-h|-\?|--help)
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) --help' -- "$cur" ) )
+        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    else
+        cur=${cur:=/dev/}
+        _filedir
+    fi
+} &&
+complete -F _hddtemp hddtemp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/hddtemp.exp b/test/completion/hddtemp.exp
new file mode 100644
index 00000000..f8c63d62
--- /dev/null
+++ b/test/completion/hddtemp.exp
@@ -0,0 +1 @@
+assert_source_completions hddtemp
diff --git a/test/lib/completions/hddtemp.exp b/test/lib/completions/hddtemp.exp
new file mode 100644
index 00000000..a6721dbf
--- /dev/null
+++ b/test/lib/completions/hddtemp.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "hddtemp -"
+
+
+sync_after_int
+
+
+teardown