diff --git a/docs/minio-limits.md b/docs/minio-limits.md
index 302684211..9b1bfc9c7 100644
--- a/docs/minio-limits.md
+++ b/docs/minio-limits.md
@@ -28,6 +28,9 @@
 | Maximum number of parts returned per list parts request                         | 10000                                         |
 | Maximum number of objects returned per list objects request                     | 4500                                          |
 | Maximum number of multipart uploads returned per list multipart uploads request | 1000                                          |
+| Maximum length for bucket names                                                 | 63                                            |
+| Maximum length for object names                                                 | 1024                                          |
+| Maximum length for '/' seperated object name segment                            | 255                                           |
 
 ### List of Amazon S3 API's not supported on MinIO
 We found the following APIs to be redundant or less useful outside of AWS S3. If you have a different view on any of the APIs we missed, please open a [GitHub issue](https://github.com/minio/minio/issues).