diff --git a/completions/vpnc b/completions/vpnc
index 115aeb7a..143798de 100644
--- a/completions/vpnc
+++ b/completions/vpnc
@@ -6,22 +6,48 @@ _vpnc()
     _init_completion || return
 
     case $prev in
-        --pfs)
-            COMPREPLY=( $( compgen -W 'nopfs dh1 dh2 dh5 server' -- "$cur" ) )
-            return 0
-            ;;
-        --pfs)
-            COMPREPLY=( $( compgen -W 'dh1 dh2 dh5' -- "$cur" ) )
-            return 0
-            ;;
-        --pid-file|--script)
-            _filedir
+        --help|--long-help|--version|--id|--username|--domain|--ifname|\
+        --application-version|--local-addr|--local-port|--udp-port|--dpd-idle|\
+        --target-network)
             return 0
             ;;
         --gateway)
             _known_hosts_real "$cur"
             return 0
             ;;
+        --vendor)
+            COMPREPLY=( $( compgen -W 'cisco netscreen' -- "$cur" ) )
+            return 0
+            ;;
+        --natt-mode)
+            COMPREPLY=( $( compgen -W 'natt none force-natt cisco-udp' \
+                -- "$cur" ) )
+            return 0
+            ;;
+        --script|--pid-file|--ca-file)
+            _filedir
+            return 0
+            ;;
+        --dh)
+            COMPREPLY=( $( compgen -W 'dh1 dh2 dh5' -- "$cur" ) )
+            return 0
+            ;;
+        --pfs)
+            COMPREPLY=( $( compgen -W 'nopfs dh1 dh2 dh5 server' -- "$cur" ) )
+            return 0
+            ;;
+        --debug)
+            COMPREPLY=( $( compgen -W '0 1 2 3 99' -- "$cur" ) )
+            return 0
+            ;;
+        --auth-mode)
+            COMPREPLY=( $( compgen -W 'psk cert hybrid' -- "$cur" ) )
+            return 0
+            ;;
+        --ca-dir)
+            _filedir -d
+            return 0
+            ;;
     esac
 
     if [[ "$cur" == -* ]]; then