diff --git a/Makefile b/Makefile
index 10794fab..045db2a9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ install:
 	install "ponysay" "$(DESTDIR)/usr/bin/ponysay"
 	install -s "ponysaytruncater" "$(DESTDIR)/usr/bin/ponysaytruncater"
 	ln -sf "ponysay" "$(DESTDIR)/usr/bin/ponythink"
+	install "zsh-completion.zsh" "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"
+	install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
 
 uninstall:
 	rm -fr "$(DESTDIR)/usr/share/ponies"
@@ -14,3 +16,5 @@ uninstall:
 	unlink "$(DESTDIR)/usr/bin/ponysay"
 	unlink "$(DESTDIR)/usr/bin/ponysaytruncater"
 	unlink "$(DESTDIR)/usr/bin/ponythink"
+	unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"
+	unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
diff --git a/completion/zsh-completion.zsh b/completion/zsh-completion.zsh
new file mode 100644
index 00000000..26116d21
--- /dev/null
+++ b/completion/zsh-completion.zsh
@@ -0,0 +1,11 @@
+#compdef ponysay
+_shortopts=(
+    '-v[Show version and exit]'
+    '-h[Show this help and exit]'
+    '-l[list ponyfiles]'
+    '-f[Select a pony (either a filename or a ponyname]: :_path_files -W "/usr/share/ponies" -g "*(\:r)"'
+    '-W[The screen column where the message should be wrapped]'
+    )
+_arguments -s : \
+    "$_shortopts[@]"
+