diff --git a/contrib/p4 b/contrib/p4
index ba763822..96cc3d56 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -9,14 +9,7 @@ _p4()
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	# rename isn't really a command
-	p4commands="add admin branch branches change changes client \
-		clients counter counters delete depot depots describe \
-		diff diff2 dirs edit filelog files fix fixes flush \
-		fstat group groups have help info integrate integrated \
-		job jobs jobspec label labels labelsync lock obliterate \
-		opened passwd print protect rename reopen resolve \
-		resolved revert review reviews set submit sync triggers \
-		typemap unlock user users verify where"
+	p4commands="$( p4 help commands | awk 'NF>3 {print $1}' )"
 	p4filetypes="ctext cxtext ktext kxtext ltext tempobj ubinary \
 		uresource uxbinary xbinary xltext xtempobj xtext \
 		text binary resource"