3 files changed, 22 insertions, 4 deletions
diff --git a/Completion/User/_pdf b/Completion/User/_pdf
index b8759864e..076b0d111 100644
--- a/Completion/User/_pdf
+++ b/Completion/User/_pdf
@@ -1,3 +1,8 @@
-#compdef acroread
+#compdef acroread pdf2dsc pdf2ps pdfimages pdfinfo pdftopbm pdftops pdftotext xpdf
 
-_files -g '*.(pdf|PDF)'
+# ghostscript:
+#  pdf2dsc pdf2ps
+# xpdf:
+#  pdfimages pdfinfo pdftopbm pdftops pdftotext xpdf
+
+_files -g '*.(#i)pdf'
diff --git a/Completion/User/_ps b/Completion/User/_ps
index 39e357b69..b91ba8a68 100644
--- a/Completion/User/_ps
+++ b/Completion/User/_ps
@@ -1,3 +1,10 @@
-#compdef  gs ghostview gv gview psnup psselect pswrap pstops pstruct lpr lp
+#compdef ps2epsi ps2pdf epsffit extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psbook psmerge psnup psresize psselect pstops psmulti pswrap lpr lp
 
-_files -g '*([pP][sS]|eps)'
+# ghostscript:
+#  ps2epsi ps2pdf
+# psutils:
+#  epsffit extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps
+#  fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psbook psmerge
+#  psnup psresize psselect pstops
+
+_files -g '*.(#i)(ps|eps)'
diff --git a/Completion/User/_pspdf b/Completion/User/_pspdf
new file mode 100644
index 000000000..014d81ce3
--- /dev/null
+++ b/Completion/User/_pspdf
@@ -0,0 +1,6 @@
+#compdef gs gsbj gsdj gsdj500 gslj gslp gsnd ps2ascii ghostview gv gview mgv ggv pstoedit pstotgif
+
+# ghostscript:
+#  gs gsbj gsdj gsdj500 gslj gslp gsnd ps2ascii
+
+_files -g '*.(#i)(ps|eps|pdf)'