diff --git a/ChangeLog b/ChangeLog
index 15c1ff6c..7e921d5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* 8.3.0: release
 
+	* Add sample completion files in completions. These can be used by
+	packagers to install on the system wherever bash and zsh keep
+	their vendor-supplied completions.
+
 	* Add configure flag --enable-check-autofiles, which is on by
 	default. Packagers whose packaging systems automatically refresh
 	autoconf or libtool files should pass --disable-check-autofiles to
diff --git a/completions/README.md b/completions/README.md
new file mode 100644
index 00000000..87803d97
--- /dev/null
+++ b/completions/README.md
@@ -0,0 +1,10 @@
+These completion files may be installed in your system's vendor completion area for bash and zsh.
+
+For example, on a debian-based system, you could install these as
+
+```
+cp bash/qpdf /usr/share/bash-completion/completions/
+cp zsh/_qpdf /usr/share/zsh/vendor-completions/
+```
+
+Packagers are encouraged to install these in whatever locations appropriate for their systems.
diff --git a/completions/bash/qpdf b/completions/bash/qpdf
new file mode 100644
index 00000000..cfc0d87a
--- /dev/null
+++ b/completions/bash/qpdf
@@ -0,0 +1 @@
+eval $(/usr/bin/qpdf --completion-bash)
diff --git a/completions/zsh/_qpdf b/completions/zsh/_qpdf
new file mode 100644
index 00000000..141b47d3
--- /dev/null
+++ b/completions/zsh/_qpdf
@@ -0,0 +1,2 @@
+#compdef qpdf
+eval $(/usr/bin/qpdf --completion-zsh)