diff --git a/completions/autoconf b/completions/autoconf
index 05d671a7..64eb5023 100644
--- a/completions/autoconf
+++ b/completions/autoconf
@@ -32,7 +32,7 @@ _autoconf()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return
     fi
 
@@ -69,7 +69,7 @@ _autoreconf()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return 0
     fi
 
@@ -103,7 +103,7 @@ _autoscan()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/automake b/completions/automake
index 0f93ea54..e1030f23 100644
--- a/completions/automake
+++ b/completions/automake
@@ -28,7 +28,7 @@ _automake()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return
     fi
 
@@ -67,7 +67,7 @@ _aclocal()
 
     $split && return 0
 
-    _longopt $1
+    COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
 } &&
 complete -F _aclocal aclocal aclocal-1.11
 
diff --git a/completions/xsltproc b/completions/xsltproc
index 32efcab4..dcf4d07f 100644
--- a/completions/xsltproc
+++ b/completions/xsltproc
@@ -40,7 +40,8 @@ _xsltproc()
         return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt xsltproc
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+        COMPREPLY=( "${COMPREPLY[@]%:}" )
     else
 	_filedir '@(xsl|xslt|xml)'
     fi