diff --git a/completions/Makefile.am b/completions/Makefile.am
index a5f99d86..2efe3228 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -41,6 +41,7 @@ bashcomp_DATA = a2x \
 		chkconfig \
 		chown \
 		chpasswd \
+		chronyc \
 		chrpath \
 		chsh \
 		cksfv \
diff --git a/completions/chronyc b/completions/chronyc
new file mode 100644
index 00000000..3544c753
--- /dev/null
+++ b/completions/chronyc
@@ -0,0 +1,69 @@
+# chronyc(1) completion                                    -*- shell-script -*-
+
+_chronyc()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        --help|-p)
+            return
+            ;;
+        -h)
+            _known_hosts_real "$cur"
+            return
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_usage "$1" )' -- "$cur" ) )
+        return
+    fi
+
+    local i args=0
+    for (( i=1; i < cword; i++ )); do
+        [[ ${words[i]} != -* && ${words[i-1]} != @(-p|-h) ]] && (( args++ ))
+    done
+    
+    case $args in
+        0)
+            COMPREPLY=( $( compgen -W "$( $1 help 2>/dev/null | \
+                awk 'NR > 1 { sub("\\|", " ", $1); print $1 }' )" -- "$cur" ) )
+            ;;
+        1)
+            case $prev in
+                accheck|cmdaccheck|delete|maxdelay|maxdelayratio|\
+                maxdelaydevratio|maxpoll|minpoll|minstratum|polltarget)
+                    _known_hosts_real "$cur"
+                    ;;
+                add)
+                    COMPREPLY=( $( compgen -W 'peer server' -- "$cur" ) )
+                    ;;
+                allow|cmdallow|cmddeny|deny)
+                    COMPREPLY=( $( compgen -W 'all' -- "$cur" ) )
+                    ;;
+                authhash)
+                    COMPREPLY=( $( compgen -W 'MD5 SHA1' -- "$cur" ) )
+                    ;;
+                dns)
+                    COMPREPLY=( $( compgen -W '-n +n -4 -6 -46' -- "$cur" ) )
+                    ;;
+                local)
+                    COMPREPLY=( $( compgen -W 'off stratum' -- "$cur" ) )
+                    ;;
+                manual)
+                    COMPREPLY=( $( compgen -W 'list on off reset' -- "$cur" ) )
+                    ;;
+                sources|sourcestats)
+                    COMPREPLY=( $( compgen -W '-v' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+        2)
+            [[ $prev == @(peer|server) ]] && _known_hosts_real "$cur"
+            ;;
+    esac
+} &&
+complete -F _chronyc chronyc
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/chronyc.exp b/test/completion/chronyc.exp
new file mode 100644
index 00000000..9f7d8216
--- /dev/null
+++ b/test/completion/chronyc.exp
@@ -0,0 +1 @@
+assert_source_completions chronyc
diff --git a/test/lib/completions/chronyc.exp b/test/lib/completions/chronyc.exp
new file mode 100644
index 00000000..33458113
--- /dev/null
+++ b/test/lib/completions/chronyc.exp
@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "chronyc -"
+sync_after_int
+
+assert_complete_any "chronyc "
+sync_after_int
+
+
+teardown