diff --git a/nginx/default.conf b/nginx/default.conf
index ef8db08..3b9fccd 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -5,12 +5,23 @@ server {
     #charset koi8-r;
     #access_log  /var/log/nginx/host.access.log  main;
 
+    # disable any limits to avoid HTTP 413 for large image uploads
+    client_max_body_size 0;
+
+    # required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486)
+    chunked_transfer_encoding on;
+
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
     }
 
 #!    location /v2 {
+#!        # Do not allow connections from docker 1.5 and earlier
+#!        # docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents
+#!        if ($http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) {
+#!            return 404;
+#!        }
 #!        proxy_pass ${REGISTRY_URL};
 #!    }
 
@@ -30,4 +41,3 @@ server {
     #    deny  all;
     #}
 }
-