diff --git a/server.go b/server.go
index 69edabf07a..6db1c63928 100644
--- a/server.go
+++ b/server.go
@@ -210,8 +210,10 @@ func (srv *Server) Images(all bool, filter string) ([]APIImages, error) {
 	}
 	outs := []APIImages{} //produce [] when empty instead of 'null'
 	for name, repository := range srv.runtime.repositories.Repositories {
-		if filter != "" && name != filter {
-			continue
+		if filter != "" {
+			if match, _ := path.Match ( filter, name ); !match {
+				continue
+			}
 		}
 		for tag, id := range repository {
 			var out APIImages