diff --git a/completions/ntpdate b/completions/ntpdate
index 594cddfb..0d18f102 100644
--- a/completions/ntpdate
+++ b/completions/ntpdate
@@ -13,14 +13,21 @@ _ntpdate()
             return 0
             ;;
         -U)
-            COMPREPLY=( $( compgen -u "$cur"  ) )
+            COMPREPLY=( $( compgen -u "$cur" ) )
+            return 0
+            ;;
+        -p)
+            COMPREPLY=( $( compgen -W '{1..8}' -- "$cur" ) )
+            return 0
+            ;;
+            
+        -a|-e|-o|-t)
             return 0
             ;;
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-4 -6 -b -B -d -Q -q -s -u -v -a\
-            -e -k -p -o -r -t' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_usage "$1" )' -- "$cur" ) )
     else
         _known_hosts_real "$cur"
     fi