diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 813f2b6ccc..999744d8a5 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -4168,9 +4168,15 @@ _docker_system() {
 }
 
 _docker_system_df() {
+	case "$prev" in
+		--format)
+			return
+			;;
+	esac
+
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--help --verbose -v" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--format --help --verbose -v" -- "$cur" ) )
 			;;
 	esac
 }
diff --git a/docs/reference/commandline/system_df.md b/docs/reference/commandline/system_df.md
index 04f8ad7aa6..aedd9779e4 100644
--- a/docs/reference/commandline/system_df.md
+++ b/docs/reference/commandline/system_df.md
@@ -21,8 +21,9 @@ Usage:	docker system df [OPTIONS]
 Show docker filesystem usage
 
 Options:
-      --help      Print usage
-  -v, --verbose   Show detailed information on space usage
+      --format string   Pretty-print images using a Go template
+      --help            Print usage
+  -v, --verbose         Show detailed information on space usage
 ```
 
 ## Description