diff --git a/bash_completion b/bash_completion
index a58093a8..f25ade44 100644
--- a/bash_completion
+++ b/bash_completion
@@ -107,7 +107,7 @@ complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype dvipdf advi dvipdfm dvipd
 complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf
 complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' kpdf
 complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' evince okular
-complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf
+complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' ps2pdf
 complete -f -X '!*.texi*' makeinfo texi2html
 complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
 complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay
diff --git a/debian/changelog b/debian/changelog
index a8a054bf..a1b22659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -146,6 +146,9 @@ bash-completion (1:1.0-1) UNRELEASED; urgency=low
   * Fix _isql completion waiting for grep input if $ODBCINI not set; handle
     whitespace in $ODBCINI.
 
+  [ Jakob Unterwurzacher ]
+  * ps2pdf can run on .pdf files as well. (Closes: #516614, LP: #316943)
+
  -- Freddy Vulto <fvulto@gmail.com>  Wed, 25 Feb 2009 21:16:46 +0100
 
 bash-completion (20080705) unstable; urgency=low