diff --git a/completions/heimdal b/completions/heimdal
index 394c713e..e909d8c2 100644
--- a/completions/heimdal
+++ b/completions/heimdal
@@ -23,10 +23,10 @@ _heimdal_encodings()
 
 _ktutil()
 {
-    local cur prev command options split=false
+    local cur prev words cword
+    _init_completion || return
 
-    COMPREPLY=()
-    _get_comp_words_by_ref cur prev
+    local command options split=false
 
     _split_longopt && split=true
 
@@ -58,15 +58,15 @@ _ktutil()
     commands='add change copy get list remove rename purge srvconvert \
         srv2keytab srvcreate key2srvtab'
 
-    for (( i=1; i < COMP_CWORD; i++ )); do
-        case ${COMP_WORDS[i]} in
+    for (( i=1; i < cword; i++ )); do
+        case ${words[i]} in
             -k|--keytab)
                 i=$(($i+1))
                 ;;
             -*)
                 ;;
             *)
-                command=${COMP_WORDS[i]}
+                command=${words[i]}
                 break
                 ;;
         esac
diff --git a/completions/hping2 b/completions/hping2
index c9bd1e03..9f20fa2e 100644
--- a/completions/hping2
+++ b/completions/hping2
@@ -4,11 +4,8 @@ have hping || have hping2 || have hping3 || return
 
 _hping2()
 {
-    local cur prev
-
-    COMPREPLY=()
-    cur=`_get_cword`
-    prev=`_get_pword`
+    local cur prev words cword
+    _init_completion || return
 
     case $prev in
         -I|--interface)