3 files changed, 121 insertions, 6 deletions
diff --git a/Completion/User/.distfiles b/Completion/User/.distfiles
index d3b287ed1..4550b9c4d 100644
--- a/Completion/User/.distfiles
+++ b/Completion/User/.distfiles
@@ -7,7 +7,7 @@ DISTFILES_SRC='
     _mailboxes _make _man _mh _mount _mutt _my_accounts
     _netscape _nslookup _other_accounts _pack _patch _pbm _pdf
     _perl_basepods _perl_builtin_funcs _perl_modules _perldoc
-    _ports _prcs _prompt _ps _pspdf _rcs _rlogin _sh _socket
+    _ports _prcs _prompt _ps _pspdf _psutils _rcs _rlogin _sh _socket
     _ssh _strip _stty _su _sudo _tar _tar_archive _telnet _tex _texi
     _tiff _uncompress _unpack _urls _use_lo _user_at_host _users
     _users_on _webbrowser _wget _whereis _whois _xargs _yodl _yp
diff --git a/Completion/User/_ps b/Completion/User/_ps
index 751c1c680..0bf6c4c95 100644
--- a/Completion/User/_ps
+++ b/Completion/User/_ps
@@ -1,13 +1,9 @@
-#compdef ps2epsi ps2pdf epsffit extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psbook psmerge psnup psresize psselect pstops psmulti pswrap
+#compdef ps2epsi ps2pdf psmulti pswrap
 
 local expl
 
 # ghostscript:
 #  ps2epsi ps2pdf
-# psutils:
-#  epsffit extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps
-#  fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psbook psmerge
-#  psnup psresize psselect pstops
 
 _description files expl 'postscript file'
 _files "$expl[@]" -g '*.(#i)(ps|eps)'
diff --git a/Completion/User/_psutils b/Completion/User/_psutils
new file mode 100644
index 000000000..7869803b9
--- /dev/null
+++ b/Completion/User/_psutils
@@ -0,0 +1,119 @@
+#compdef epsffit extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psbook psmerge psnup psresize psselect pstops getafm showchar
+
+case "$words[1]" in
+epsffit)
+  _arguments \
+    '-v[print version]' \
+    '-c[centres the image in the bounding box given]' \
+    '-r[rotates the image by 90 degrees anti-clockwise]' \
+    '-a[alters the aspect ratio to fit the bounding box]' \
+    '-s[adds a showpage at the end of the image]' \
+    '-m[rotates the image to maximise the size]' \
+    ':lower left x:' \
+    ':lower left y:' \
+    ':upper right x:' \
+    ':upper right y:' \
+    ':input file:_ps' \
+    ':output file:_ps'
+  ;;
+psbook)
+  _arguments \
+    '-q[quiet mode]' \
+    '-v[print version]' \
+    '-s-[signature size]:signature size:' \
+    ':input file:_ps' \
+    ':output file:_ps'
+  ;;
+psnup)
+  _arguments \
+    '-q[quiet mode]' \
+    '-v[print version]' \
+    '(-p)-w-[page width]:paper width:' \
+    '(-p)-h-[page height]:paper height:' \
+    '(-w -h)-p-[page size]:paper size:(a3 a4 a5 b5 letter legal 10x14)' \
+    '(-P)-W-[input page width]:input paper width:' \
+    '(-P)-H-[input page height]:input paper height:' \
+    '(-W -H)-P-[input page paper]:input paper paper:(a3 a4 a5 b5 letter legal 10x14)' \
+    '(   -r -f)-l[landscape (rotated left)]' \
+    '(-l    -f)-r[seascape (rotated right)]' \
+    '(-l -r   )-f[flipped]' \
+    '-c[column major layout]' \
+    '-m-[margins around whole page]:margins around whole page:' \
+    '-b-[border around individual pages]:border around individual pages:' \
+    '-d-[draw borders]:line width for borders:' \
+    '-s-[override scale]:scale:' \
+    '(   -4 -8 -n)-2[2 logical pages on a sheet]' \
+    '(-2    -8 -n)-4[4 logical pages on a sheet]' \
+    '(-2 -4    -n)-8[8 logical pages on a sheet]' \
+    '(-2 -4 -8   )-n[n-up]:pages on a sheet:' \
+    '-t-[layout tolerance]:layout tolerance:' \
+    ':input file:_ps' \
+    ':output file:_ps'
+  ;;
+psresize)
+  _arguments \
+    '-q[quiet mode]' \
+    '-v[print version]' \
+    '(-p)-w-[page width]:paper width:' \
+    '(-p)-h-[page height]:paper height:' \
+    '(-w -h)-p-[page size]:paper size:(a3 a4 a5 b5 letter legal 10x14)' \
+    '(-P)-W-[input page width]:input paper width:' \
+    '(-P)-H-[input page height]:input paper height:' \
+    '(-W -H)-P-[input page paper]:input paper paper:(a3 a4 a5 b5 letter legal 10x14)' \
+    ':input file:_ps' \
+    ':output file:_ps'
+  ;;
+psselect)
+  _arguments \
+    '-q[quiet mode]' \
+    '-v[print version]' \
+    '-e[select even pages]' \
+    '-o[select odd pages]' \
+    '-r[reverse order]' \
+    '-p-[pages]:pages:' \
+    ':input file:_ps' \
+    ':output file:_ps'
+  ;;
+pstops)
+  _arguments \
+    '-q[quiet mode]' \
+    '-v[print version]' \
+    '-d-[draw borders]:line width for borders:' \
+    '-b[no bind operator]' \
+    '(-p)-w-[page width]:paper width:' \
+    '(-p)-h-[page height]:paper height:' \
+    '(-w -h)-p-[page size]:paper size:(a3 a4 a5 b5 letter legal 10x14)' \
+    ':[modulo\:][-]pageno[L][R][U][@scale][(xoff,yoff)][+|,]...:' \
+    ':input file:_ps' \
+    ':output file:_ps'
+  ;;
+extractres)
+  _arguments \
+    '-m[merge]' \
+    ':input file:_ps'
+  ;;
+fixmacps)
+  _arguments \
+    '-d[directory]:directory:_files -/' \
+    '-n[name]:name:' \
+    ':input file:_ps'
+  ;;
+psmerge)
+  _arguments \
+    '-o-[output file]:output file:_ps' \
+    '-t[thorough]' \
+    '*:input file:_ps'
+  ;;
+fixdlsrps|fixfmps|fixpsditps|fixpspps|fixscribeps|fixtpps|fixwfwps|fixwpps|fixwwps|includeres)
+  _ps
+  ;;
+getafm)
+  _arguments \
+    ':font name:'
+  ;;
+showchar)
+  _arguments \
+    ':font name:' \
+    ':character name:'
+  ;;
+esac