diff --git a/contrib/p4 b/contrib/p4
index 2c2a65c1..4f5c66bb 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -3,7 +3,7 @@
 have p4 &&
 _p4()
 {
-    local cur prev prev2 p4commands p4filetypes
+    local cur prev preprev p4commands p4filetypes
 
     COMPREPLY=()
     cur=`_get_cword`
@@ -31,10 +31,10 @@ _p4()
                 ;;
         esac
     elif [ $COMP_CWORD -gt 2 ]; then
-        prev2=${COMP_WORDS[COMP_CWORD-2]}
+        preprev=${COMP_WORDS[COMP_CWORD-2]}
         case $prev in
             -t)
-                case $prev2 in
+                case $preprev in
                     add|edit|reopen)
                         COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur") )
                         ;;