diff --git a/bash_completion.sh b/bash_completion.sh
index e14378a6..915960b6 100644
--- a/bash_completion.sh
+++ b/bash_completion.sh
@@ -1,16 +1,12 @@
-# Check for bash (and that we haven't already been sourced).
-[ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return
+# Check for interactive bash and that we haven't already been sourced.
+[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return
 
 # Check for recent enough version of bash.
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-
-# Check for interactive shell.
-if [ -n "$PS1" ]; then
-  if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
-    if [ -r /etc/bash_completion ]; then
-      # Source completion code.
-      . /etc/bash_completion
-    fi
+if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
+  if [ -r /etc/bash_completion ]; then
+    # Source completion code.
+    . /etc/bash_completion
   fi
 fi
 unset bash bminor bmajor
diff --git a/debian/changelog b/debian/changelog
index f4121453..616027c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -143,6 +143,7 @@ bash-completion (1:1.0-1) UNRELEASED; urgency=low
   * Make okular complete on same files as evince, thanks to Mary Ellen Foster
     (RHBZ: #486998).
   * Apply ps2pdf completion to ps2pdf{12,13,14,wr} too.
+  * Simplify bash_completion.sh, return earlier in non-applicable environments.
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing