diff --git a/api/client/commands.go b/api/client/commands.go
index 1dd6194958..00dd761b16 100644
--- a/api/client/commands.go
+++ b/api/client/commands.go
@@ -1148,7 +1148,7 @@ func (cli *DockerCli) CmdImages(args ...string) error {
 	flTree := cmd.Bool([]string{"#t", "#tree", "#-tree"}, false, "Output graph in tree format")
 
 	var flFilter opts.ListOpts
-	cmd.Var(&flFilter, []string{"f", "-filter"}, "Provide filter values (i.e. 'tagged=false')")
+	cmd.Var(&flFilter, []string{"f", "-filter"}, "Provide filter values (i.e. 'dangling=true')")
 
 	if err := cmd.Parse(args); err != nil {
 		return nil
diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
index 0c3623f9e2..829f13b9a6 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/sources/reference/commandline/cli.md
@@ -440,7 +440,7 @@ To see how the `docker:latest` image was built:
     List images
 
       -a, --all=false      Show all images (by default filter out the intermediate image layers)
-      -f, --filter=[]: Provide filter values (i.e. 'tagged=false')
+      -f, --filter=[]:     Provide filter values (i.e. 'dangling=true')
       --no-trunc=false     Don't truncate output
       -q, --quiet=false    Only show numeric IDs
 
@@ -486,11 +486,11 @@ The filtering flag (-f or --filter) format is of "key=value". If there are more
 than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`)
 
 Current filters:
- * untagged (boolean - true or false)
+ * dangling (boolean - true or false)
 
 #### untagged images
 
-    $ sudo docker images --filter "untagged=true"
+    $ sudo docker images --filter "dangling=true"
 
     REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
     <none>              <none>              8abc22fbb042        4 weeks ago         0 B
@@ -508,7 +508,7 @@ By having this flag it allows for batch cleanup.
 
 Ready for use by `docker rmi ...`, like:
 
-    $ sudo docker rmi $(sudo docker images -f "untagged=true" -q)
+    $ sudo docker rmi $(sudo docker images -f "dangling=true" -q)
 
     8abc22fbb042
     48e5f45168b9
diff --git a/server/server.go b/server/server.go
index 967129b908..8c70842a47 100644
--- a/server/server.go
+++ b/server/server.go
@@ -704,7 +704,7 @@ func (srv *Server) Images(job *engine.Job) engine.Status {
 	if err != nil {
 		return job.Error(err)
 	}
-	if i, ok := imageFilters["untagged"]; ok {
+	if i, ok := imageFilters["dangling"]; ok {
 		for _, value := range i {
 			if strings.ToLower(value) == "true" {
 				filt_tagged = false