diff --git a/docker-complete b/docker-complete
index fe648fd..421bff5 100644
--- a/docker-complete
+++ b/docker-complete
@@ -20,6 +20,11 @@ _docker_names()
         | sed -rne 's|/(.*)|\1|p'
 }
 
+_docker_images()
+{
+    docker images | sed '1d' | sed '/^<none>/d' | awk -F" " '{print $1}' | uniq
+}
+
 _docker() 
 {
     local cur prev opts
@@ -34,6 +39,11 @@ _docker()
             COMPREPLY=( $(compgen -W "${names}" -- ${cur}) )
             return 0
             ;;
+	images|run)
+	    local names="$(_docker_images)"
+            COMPREPLY=( $(compgen -W "${names}" -- ${cur}) )
+            return 0
+            ;;
     esac
 
     COMPREPLY=($(compgen -W "${opts}" -- ${cur}))