diff --git a/contrib/man/md/docker-run.1.md b/contrib/man/md/docker-run.1.md
index e90ecab85f..3d2420cdbd 100644
--- a/contrib/man/md/docker-run.1.md
+++ b/contrib/man/md/docker-run.1.md
@@ -100,8 +100,8 @@ container can be started with the **--link**.
 **-m**, **-memory**=*memory-limit*
    Allows you to constrain the memory available to a container. If the host
 supports swap memory, then the -m memory setting can be larger than physical
-RAM. The memory limit format: <number><optional unit>, where unit = b, k, m or
-g.
+RAM. If a limit of 0 is specified, the container's memory is not limited. The 
+memory limit format: <number><optional unit>, where unit = b, k, m or g.
 
 **-P**, **-publish-all**=*true*|*false*
    When set to true publish all exposed ports to the host interfaces. The
diff --git a/contrib/man/old-man/docker-run.1 b/contrib/man/old-man/docker-run.1
index ae0295943d..0e06e8d682 100644
--- a/contrib/man/old-man/docker-run.1
+++ b/contrib/man/old-man/docker-run.1
@@ -39,7 +39,7 @@ CPU shares in relative weight. You can increase the priority of a container with
 
 .TP
 .B -m, --memory=\fImemory-limit\fR: 
-Allows you to constrain the memory available to a container. If the host supports swap memory, then the -m memory setting can be larger than physical RAM. The memory limit format: <number><optional unit>, where unit = b, k, m or g.
+Allows you to constrain the memory available to a container. If the host supports swap memory, then the -m memory setting can be larger than physical RAM. If a limit of 0 is specified, the container's memory is not limited. The memory limit format: <number><optional unit>, where unit = b, k, m or g.
 
 .TP
 .B --cidfile=\fIfile\fR: