diff --git a/salt/states/quota.py b/salt/states/quota.py
new file mode 100644
index 0000000000..d4724f65a0
--- /dev/null
+++ b/salt/states/quota.py
@@ -0,0 +1,57 @@
+'''
+Management of Posix Quotas
+==========================
+
+The quota can be managed for the system:
+
+.. code-block:: yaml
+
+    en_US.UTF-8:
+      quota.system
+'''
+
+
+def __virtual__():
+    '''
+    Only load if the quota module is available in __salt__
+    '''
+    return 'quota' if 'quota.report' in __salt__ else False
+
+
+def mode(name, mode, quotatype):
+    '''
+    Set the quota for the system
+
+    name
+        The filesystem to set the quota mode on
+
+    mode
+        Whether the quota system is 'on' or 'off'
+
+    quotatype
+        Need to be 'user' or 'group'
+    '''
+    ret = {'name': name,
+           'changes': {},
+           'result': None,
+           'comment': ''}
+    fun = 'off'
+    if mode is True:
+        fun = 'on'
+    if __salt__['quota.get_mode'](name)[name][quotatype] == fun:
+        ret['result'] = True
+        ret['comment'] = 'Quota for {0} already set to {1}'.format(name, fun)
+        return ret
+    if __opts__['test']:
+        ret['comment'] = 'Quota for {0} needs to be set to {1}'.format(name,
+                                                                       fun)
+        return ret
+    if __salt__['quota.{0}'.format(fun)](name):
+        ret['changes'] = {'quota': name}
+        ret['result'] = True
+        ret['comment'] = 'Set quota for {0} to {1}'.format(name, fun)
+        return ret
+    else:
+        ret['result'] = False
+        ret['comment'] = 'Failed to set quota for {0} to {1}'.format(name, fun)
+        return ret