diff --git a/cli/command/system/info.go b/cli/command/system/info.go
index dfbc83d90a..7ab658c136 100644
--- a/cli/command/system/info.go
+++ b/cli/command/system/info.go
@@ -147,8 +147,8 @@ func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error {
 				case "Name":
 					fmt.Fprintf(dockerCli.Out(), " %s\n", o.Value)
 				case "Profile":
-					if o.Key != "default" {
-						fmt.Fprintf(dockerCli.Err(), "  WARNING: You're not using the Docker's default seccomp profile\n")
+					if o.Value != "default" {
+						fmt.Fprintf(dockerCli.Err(), "  WARNING: You're not using the default seccomp profile\n")
 					}
 					fmt.Fprintf(dockerCli.Out(), "  %s: %s\n", o.Key, o.Value)
 				}
diff --git a/docs/reference/api/docker_remote_api.md b/docs/reference/api/docker_remote_api.md
index 51814a5f30..a8e62d10f9 100644
--- a/docs/reference/api/docker_remote_api.md
+++ b/docs/reference/api/docker_remote_api.md
@@ -165,6 +165,7 @@ This section lists each version from latest to oldest.  Each listing includes a
 * The `SecurityOptions` field within the `GET /info` response now includes `userns` if user namespaces are enabled in the daemon.
 * `GET /nodes` and `GET /node/(id or name)` now return `Addr` as part of a node's `Status`, which is the address that that node connects to the manager from.
 * The `HostConfig` field now includes `NanoCPUs` that represents CPU quota in units of 10<sup>-9</sup> CPUs.
+* `GET /info` now returns more structured information about security options.
 
 ### v1.24 API changes
 
diff --git a/docs/reference/api/docker_remote_api_v1.25.md b/docs/reference/api/docker_remote_api_v1.25.md
index 78f3000b68..a174e1c068 100644
--- a/docs/reference/api/docker_remote_api_v1.25.md
+++ b/docs/reference/api/docker_remote_api_v1.25.md
@@ -2509,10 +2509,26 @@ Display system-wide information
             ]
         },
         "SecurityOptions": [
-            "apparmor",
-            "seccomp",
-            "selinux",
-            "userns"
+            {
+                "Key": "Name",
+                "Value": "seccomp"
+            },
+            {
+                "Key": "Profile",
+                "Value": "default"
+            },
+            {
+                "Key": "Name",
+                "Value": "apparmor"
+            },
+            {
+                "Key": "Name",
+                "Value": "selinux"
+            },
+            {
+                "Key": "Name",
+                "Value": "userns"
+            }
         ],
         "ServerVersion": "1.9.0",
         "SwapLimit": false,