diff --git a/completions/rpm b/completions/rpm
index 58383651..903a299a 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -18,15 +18,16 @@ _rpm_installed_packages()
         COMPREPLY=( $( compgen -W '$( rpmqpack )' -- "$cur" ) )
     else
         _rpm_nodigsig
-        COMPREPLY=( $( rpm -qa $nodig $nosig --qf='%{NAME} ' "$cur*" ) )
+        COMPREPLY=( $( rpm -qa $nodig $nosig --queryformat='%{NAME} ' \
+            "$cur*" ) )
     fi
 }
 
 _rpm_groups()
 {
     local IFS=$'\n'
-    COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig --queryformat \
-        '%{group}\n' )" -- "$cur" ) )
+    COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
+        --queryformat='%{GROUP}\n' )" -- "$cur" ) )
 }
 
 _rpm_nodigsig()
@@ -119,7 +120,7 @@ _rpm()
                 # complete on capabilities
                 local IFS=$'\n'
                 COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
-                    --queryformat='%{providename}\n' )" -- "$cur" ) )
+                    --queryformat='%{PROVIDENAME}\n' )" -- "$cur" ) )
             fi
             return 0
             ;;
@@ -130,7 +131,7 @@ _rpm()
                 # complete on capabilities
                 local IFS=$'\n'
                 COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
-                        --queryformat='%{requirename}\n' )" -- "$cur" ) )
+                        --queryformat='%{REQUIRENAME}\n' )" -- "$cur" ) )
             fi
             return 0
             ;;