diff --git a/magnum/api/controllers/versions.py b/magnum/api/controllers/versions.py
index da215ba834..67caafb0d7 100644
--- a/magnum/api/controllers/versions.py
+++ b/magnum/api/controllers/versions.py
@@ -38,10 +38,11 @@ REST_API_VERSION_HISTORY = """REST API Version History:
     * 1.3 - Add bay rollback support
     * 1.4 - Add stats API
     * 1.5 - Add cluster CA certificate rotation support
+    * 1.6 - Add quotas API
 """
 
 BASE_VER = '1.1'
-CURRENT_MAX_VER = '1.5'
+CURRENT_MAX_VER = '1.6'
 
 
 class Version(object):
diff --git a/magnum/api/rest_api_version_history.rst b/magnum/api/rest_api_version_history.rst
index a426da3253..a9aa04b815 100644
--- a/magnum/api/rest_api_version_history.rst
+++ b/magnum/api/rest_api_version_history.rst
@@ -66,3 +66,12 @@ user documentation.
 
   This gives admins a way to revoke access to an existing cluster once
   a user has been granted access.
+
+
+1.6
+---
+
+  Add quotas API
+
+  An admin user can set/update/delete/list quotas for the given tenant.
+  A non-admin user can get self quota information.
diff --git a/magnum/tests/unit/api/controllers/test_root.py b/magnum/tests/unit/api/controllers/test_root.py
index e0dae316a9..789e1041c3 100644
--- a/magnum/tests/unit/api/controllers/test_root.py
+++ b/magnum/tests/unit/api/controllers/test_root.py
@@ -40,7 +40,7 @@ class TestRootController(api_base.FunctionalTest):
                                [{u'href': u'http://localhost/v1/',
                                  u'rel': u'self'}],
                            u'status': u'CURRENT',
-                           u'max_version': u'1.5',
+                           u'max_version': u'1.6',
                            u'min_version': u'1.1'}]}
 
         self.v1_expected = {