diff --git a/completions/Makefile.am b/completions/Makefile.am
index f91a6893..38db3efd 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -166,6 +166,7 @@ bashcomp_DATA = 2to3 \
 		javaws \
 		jpegoptim \
 		jps \
+		jshint \
 		k3b \
 		kcov \
 		kill \
diff --git a/completions/jshint b/completions/jshint
new file mode 100644
index 00000000..1ed90836
--- /dev/null
+++ b/completions/jshint
@@ -0,0 +1,38 @@
+# bash completion for jshint                               -*- shell-script -*-
+
+_jshint()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    case $prev in
+        -v|--version|-h|--help|--exclude|--filename|-e|--extra-ext)
+            return
+            ;;
+        -c|--config)
+            _filedir
+            return
+            ;;
+        --reporter)
+            COMPREPLY=( $( compgen -W "jslint checkstyle unix" -- "$cur" ) )
+            return
+            ;;
+        --extract)
+            COMPREPLY=( $( compgen -W "auto always never" -- "$cur" ) )
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        return
+    fi
+
+    _filedir js
+} &&
+complete -F _jshint jshint
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/jshint.exp b/test/completion/jshint.exp
new file mode 100644
index 00000000..4416472c
--- /dev/null
+++ b/test/completion/jshint.exp
@@ -0,0 +1 @@
+assert_source_completions jshint
diff --git a/test/lib/completions/jshint.exp b/test/lib/completions/jshint.exp
new file mode 100644
index 00000000..553883e1
--- /dev/null
+++ b/test/lib/completions/jshint.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "jshint "
+sync_after_int
+
+
+teardown