diff --git a/cli/command/system/info.go b/cli/command/system/info.go
index 4853e1dba1..cc28226da9 100644
--- a/cli/command/system/info.go
+++ b/cli/command/system/info.go
@@ -180,11 +180,9 @@ func prettyPrintClientInfo(dockerCli command.Cli, info clientInfo) {
 		fmt.Fprintln(dockerCli.Out(), " Plugins:")
 		for _, p := range info.Plugins {
 			if p.Err == nil {
-				var version string
-				if p.Version != "" {
-					version = ", " + p.Version
-				}
-				fmt.Fprintf(dockerCli.Out(), "  %s: %s (%s%s)\n", p.Name, p.ShortDescription, p.Vendor, version)
+				fmt.Fprintf(dockerCli.Out(), "  %s: %s (%s)\n", p.Name, p.ShortDescription, p.Vendor)
+				fprintlnNonEmpty(dockerCli.Out(), "    Version: ", p.Version)
+				fprintlnNonEmpty(dockerCli.Out(), "    Path:    ", p.Path)
 			} else {
 				info.Warnings = append(info.Warnings, fmt.Sprintf("WARNING: Plugin %q is not valid: %s", p.Path, p.Err))
 			}
diff --git a/cli/command/system/testdata/docker-info-plugins.golden b/cli/command/system/testdata/docker-info-plugins.golden
index db066cc1ae..98c88d0ea0 100644
--- a/cli/command/system/testdata/docker-info-plugins.golden
+++ b/cli/command/system/testdata/docker-info-plugins.golden
@@ -2,8 +2,11 @@ Client:
  Context:    default
  Debug Mode: false
  Plugins:
-  goodplugin: unit test is good (ACME Corp, 0.1.0)
+  goodplugin: unit test is good (ACME Corp)
+    Version:  0.1.0
+    Path:     /path/to/docker-goodplugin
   unversionedplugin: this plugin has no version (ACME Corp)
+    Path:     /path/to/docker-unversionedplugin
 
 Server:
  Containers: 0