diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index 1bd73c2439..8992712b10 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -2631,6 +2631,33 @@ _renumberMesh_ ()
 }
 complete -o filenames -o nospace -F _renumberMesh_ renumberMesh
 
+_reorderPatches_ ()
+{
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local prev="${COMP_WORDS[COMP_CWORD-1]}"
+    local line=${COMP_LINE}
+    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
+
+    opts="-case -constant -doc -fileHandler -help -hostRoots -latestTime -libs -noFunctionObjects -noZero -overwrite -parallel -patchOrder -referenceCase -referenceRegion -region -roots -srcDoc -time"
+    for o in $used ; do opts="${opts/$o/}" ; done
+    extra=""
+
+    [ "$COMP_CWORD" = 1 ] || \
+    case "$prev" in
+        -case)
+            opts="" ; extra="-d" ;;
+        -fileHandler)
+            opts="uncollated collated masterUncollated" ; extra="" ;;
+        -time)
+            opts="$(foamListTimes -withZero 2> /dev/null)" ; extra="" ;;
+        -hostRoots|-libs|-patchOrder|-referenceCase|-referenceRegion|-region|-roots)
+            opts="" ; extra="" ;;
+       *) ;;
+    esac
+    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
+}
+complete -o filenames -o nospace -F _reorderPatches_ reorderPatches
+
 _rhoPorousSimpleFoam_ ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"