diff --git a/completions/arch b/completions/arch
index e275577bc00..f1a1144ac3c 100644
--- a/completions/arch
+++ b/completions/arch
@@ -13,7 +13,7 @@ _arch()
             COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
             return
             ;;
-        -d|--file)
+        --file)
             _filedir
             return
             ;;
diff --git a/completions/dpkg-source b/completions/dpkg-source
index b564f0c4616..7239b58d023 100644
--- a/completions/dpkg-source
+++ b/completions/dpkg-source
@@ -59,7 +59,7 @@ _dpkg_source()
                     # -F: force change log format
                     COMPREPLY=( $(command ls /usr/lib/dpkg/parsechangelog) )
                     ;;
-                -V|-D)
+                -V)
                     # -V: set a substitution variable
                     # we don't know anything about possible variables or values
                     # so we don't try to suggest any completion.
diff --git a/completions/find b/completions/find
index 80fbe8c02b8..7da2774c65d 100644
--- a/completions/find
+++ b/completions/find
@@ -12,8 +12,8 @@ _find()
             COMPREPLY=( $(compgen -W '{0..9}' -- "$cur") )
             return
             ;;
-        -newer|-anewer|-cnewer|-fls|-fprint|-fprint0|-fprintf|-name|-iname|\
-        -lname|-ilname|-wholename|-iwholename|-samefile)
+        -newer|-anewer|-cnewer|-fls|-fprint|-fprint0|-fprintf|-name|-[il]name|\
+        -ilname|-wholename|-[il]wholename|-samefile)
             _filedir
             return
             ;;
@@ -49,9 +49,8 @@ _find()
             _command
             return
             ;;
-        -[acm]min|-[acm]time|-iname|-lname|-wholename|-iwholename|-lwholename|\
-        -ilwholename|-inum|-path|-ipath|-regex|-iregex|-links|-perm|-size|\
-        -used|-printf|-context)
+        -[acm]min|-[acm]time|-inum|-path|-ipath|-regex|-iregex|-links|-perm|\
+        -size|-used|-printf|-context)
             # do nothing, just wait for a parameter to be given
             return
             ;;
diff --git a/completions/jarsigner b/completions/jarsigner
index 4bc4b3ffc02..3fb0fb4e955 100644
--- a/completions/jarsigner
+++ b/completions/jarsigner
@@ -16,7 +16,7 @@ _jarsigner()
         -providerArg)
             return
             ;;
-        -certchain|-sigfile|-tsa)
+        -certchain|-tsa)
             _filedir
             return
             ;;
diff --git a/completions/java b/completions/java
index 89d207d239c..403e915d89d 100644
--- a/completions/java
+++ b/completions/java
@@ -263,10 +263,6 @@ _javadoc()
             _java_path
             return
             ;;
-        -helpfile)
-            _filedir
-            return
-            ;;
     esac
 
     # -linkoffline takes two arguments
diff --git a/completions/mplayer b/completions/mplayer
index 525c63e228a..9783607ef78 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -113,8 +113,7 @@ _mplayer()
             return
             ;;
         -edl|-edlout|-lircconf|-menu-cfg|-playlist|-csslib|-dumpfile| \
-        -subfile|-vobsub|-aofile|-fbmodeconfig|-include|-o|-dvdkey| \
-        -passlogfile)
+        -subfile|-aofile|-fbmodeconfig|-include|-o|-dvdkey|-passlogfile)
             _filedir
             return
             ;;
diff --git a/completions/pkgadd b/completions/pkgadd
index 576b4114c14..256385fa1a4 100644
--- a/completions/pkgadd
+++ b/completions/pkgadd
@@ -32,7 +32,7 @@ _pkgadd ()
         -k|-s|-R)
             _filedir -d
             ;;
-        -P|-k|-x)
+        -P|-x)
             ;;
         *)
             if [[ ${cur} == -* ]]; then
diff --git a/completions/sync_members b/completions/sync_members
index 653c0ea9b0c..d5c45eb8700 100644
--- a/completions/sync_members
+++ b/completions/sync_members
@@ -10,7 +10,7 @@ _sync_members()
             COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
             return
             ;;
-        -d|--file)
+        --file)
             _filedir
             return
             ;;