diff --git a/daemon/configuration.md b/daemon/configuration.md
index abf726d9..67145d65 100644
--- a/daemon/configuration.md
+++ b/daemon/configuration.md
@@ -103,7 +103,7 @@ Please note that all of the settings above are in the `docker.policy.network.X`
 | Setting Path | Default Value | Notes |
 | ------------ | ------------- | ----- |
 | `tmpfs` | `rw,exec,nosuid,size=50M` | These are the arguments used for mounting a `tmpfs` directory into containers to allow certain programs to run. |
-| `log_driver` | none | The log driver to use for containers. We default to `none` to mitigate a potential DoS attack vector if a server were to spam log output. |
+| `log_driver` | none | :warning: This option was **removed** in `v0.6` and is forcibly set to `json-file`. The log driver to use for containers. We default to `none` to mitigate a potential DoS attack vector if a server were to spam log output. |
 | `readonly_root` | true | Determines if the root filesystem of the container should be readonly. |
 | `securityopts` | array | An array of security options to apply to a container. The default array is provided below. |
 | `cap_drop` | array | An array of linux capabilities to drop from the container (in addition to ones [dropped by docker already](https://docs.docker.com/engine/security/security/#linux-kernel-capabilities). A listing of the default array is below. |
@@ -118,19 +118,20 @@ Please note that all of the settings above are in the `docker.policy.container.X
 ```
 
 ### Default Capabilities Drop Array
+
+::: warning
+Starting with `v0.6` of the Daemon, the following previously _dropped_ capabilities are available in containers: `chown`, `kill`, `setgid`, and `setuid`.
+:::
+
 ``` json
 [
     'setpcap',
     'mknod',
     'audit_write',
-    'chown',
     'net_raw',
     'dac_override',
     'fowner',
     'fsetid',
-    'kill',
-    'setgid',
-    'setuid',
     'net_bind_service',
     'sys_chroot',
     'setfcap',