diff --git a/contrib/heimdal b/contrib/heimdal
index f22a5866..565af780 100644
--- a/contrib/heimdal
+++ b/contrib/heimdal
@@ -7,15 +7,15 @@ have ktutil && {
 _heimdal_principals()
 {
 
-	COMPREPLY=( $( kadmin -l dump 2>/dev/null | awk '{print $1}' | \
-		grep "^$cur" ) )
+	COMPREPLY=( $( compgen -W "$( kadmin -l dump 2>/dev/null | \
+		awk '{print $1}' )" -- $cur ) )
 }
 
 _heimdal_realms()
 {
 
-	COMPREPLY=( $( kadmin -l dump 2>/dev/null | awk '{print $1}' | \
-		awk -F @ '{print $2}' | grep "^$cur" ) )
+	COMPREPLY=( $( compgen -W "( kadmin -l dump 2>/dev/null | \
+		awk '{print $1}' | awk -F @ '{print $2}' )" -- $cur ) )
 }
 
 _heimdal_encodings()