diff --git a/completions/cups b/completions/cups
index 6ba7bff1..21ddd769 100644
--- a/completions/cups
+++ b/completions/cups
@@ -11,6 +11,66 @@ _cancel()
 } &&
 complete -F _cancel cancel
 
+have lpr || return
+
+_lpr()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    compopt +o nospace
+    case $prev in
+        -P)
+            COMPREPLY=( $( compgen -W "$( lpstat -a | cut -d' ' -f1 )" -- "$cur" ) )
+            return 0
+            ;;
+        -U)
+            COMPREPLY=( $( compgen -u -- "$cur" ) )
+            return 0
+            ;;
+        -o)
+            compopt -o nospace
+            COMPREPLY=( $( compgen -W "media= landscape orientation-requested= sides= fitplot number-up= scaling= cpi= lpi= page-bottom= page-top= page-left= page-right=" -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == - ]]; then
+        COMPREPLY=( $( compgen -W '-E -H -C -J -T -P -U -h -l -m -o -p -q -r' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _lpr lpr
+
+have lpq || return
+
+_lpq()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -P)
+            COMPREPLY=( $( compgen -W "$( lpstat -a | cut -d' ' -f1 )" -- "$cur" ) )
+            return 0
+            ;;
+        -U)
+            COMPREPLY=( $( compgen -u -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == - ]]; then
+        COMPREPLY=( $( compgen -W '-E -P -U -a -h -l' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _lpq lpq
+
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4