diff --git a/completions/Makefile.am b/completions/Makefile.am
index 21201925..a5706239 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -214,6 +214,7 @@ bashcomp_DATA = a2x \
 		pkg-config \
 		pkg_delete \
 		pkgtool \
+		plague-client \
 		pm-hibernate \
 		pm-is-supported \
 		pm-powersave \
diff --git a/completions/plague-client b/completions/plague-client
new file mode 100644
index 00000000..b5385467
--- /dev/null
+++ b/completions/plague-client
@@ -0,0 +1,14 @@
+# bash completion for plague-client                        -*- shell-script -*-
+
+_plague_client()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    [[ $cword -eq 1 ]] && \
+        COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list
+            list_builders pause requeue unpause update_builders' -- "$cur" ) )
+} &&
+complete -F _plague_client plague-client
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/plague-client.exp b/test/completion/plague-client.exp
new file mode 100644
index 00000000..6f9a9373
--- /dev/null
+++ b/test/completion/plague-client.exp
@@ -0,0 +1 @@
+assert_source_completions plague-client
diff --git a/test/lib/completions/plague-client.exp b/test/lib/completions/plague-client.exp
new file mode 100644
index 00000000..ddcc8491
--- /dev/null
+++ b/test/lib/completions/plague-client.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "plague-client "
+
+
+sync_after_int
+
+
+teardown