diff --git a/conf/master b/conf/master
index 9ca7d2e5d772..41898abb139c 100644
--- a/conf/master
+++ b/conf/master
@@ -327,6 +327,14 @@
 # If set to 'changes', the output will be full unless the state didn't change.
 #state_output: full
 
+# Automatically aggregate all states that have support for mod_aggregate by
+# setting to True. Or pass a list of state module names to automatically
+# aggregate just those types.
+#
+# state_aggregate:
+#   - pkg
+#
+#state_aggregate: False
 
 #####      File Server settings      #####
 ##########################################
diff --git a/conf/minion b/conf/minion
index ac4e4f03e737..99a027a6d122 100644
--- a/conf/minion
+++ b/conf/minion
@@ -368,6 +368,14 @@
 # Top file to execute if startup_states is 'top':
 #top_file: ''
 
+# Automatically aggregate all states that have support for mod_aggregate by
+# setting to True. Or pass a list of state module names to automatically
+# aggregate just those types.
+#
+# state_aggregate:
+#   - pkg
+#
+#state_aggregate: False
 
 #####     File Directory Settings    #####
 ##########################################
diff --git a/doc/ref/states/aggregate.rst b/doc/ref/states/aggregate.rst
index 285e9391c407..adbd6ffb58da 100644
--- a/doc/ref/states/aggregate.rst
+++ b/doc/ref/states/aggregate.rst
@@ -13,44 +13,71 @@ all, it makes Salt much more dynamic.
 How it Works
 ============
 
-The best example is the `pkg` state. One of the major requests in Salt has long
+The best example is the ``pkg`` state. One of the major requests in Salt has long
 been adding the ability to install all packages defined at the same time. The
 mod_aggregate system makes this a reality. While executing Salt's state system,
-when a `pkg` state is reached the ``mod_aggregate`` function in the state module
-is called. For `pkg` this function scans all of the other states that are slated
+when a ``pkg`` state is reached the ``mod_aggregate`` function in the state module
+is called. For ``pkg`` this function scans all of the other states that are slated
 to run, and picks up the references to ``name`` and ``pkgs``, then adds them to
-``pkgs`` in the first state. The result is calling yum/apt-get/pacman etc. just
-once to install of the packages as part of the first package install.
+``pkgs`` in the first state. The result is a single call to yum, apt-get,
+pacman, etc as part of the first package install.
 
 How to Use it
 =============
 
-
 .. note::
 
     Since this option changes the basic behavior of the state runtime, after
     it is enabled states should be executed using `test=True` to ensure that
     the desired behavior is preserved.
 
-Since this behavior can dramatically change the flow of configuration
-management inside of Salt it is disabled by default. But enabling it is easy.
+In config files
+---------------
+
+The first way to enable aggregation is with a configuration option in either
+the master or minion configuration files. Salt will invoke ``mod_aggregate``
+the first time it encounters a state module that has aggregate support.
+
+If this option is set in the master config it will apply to all state runs on
+all minions, if set in the minion config it will only apply to said minion.
 
-To enable for all states just add:
+Enable for all states:
 
 .. code-block:: yaml
 
     state_aggregate: True
 
-Similarly only specific states can be enabled:
+Enable for only specific state modules:
 
 .. code-block:: yaml
 
     state_aggregate:
       - pkg
 
-To the master or minion config and restart the master or minion, if this option
-is set in the master config it will apply to all state runs on all minions, if
-set in the minion config it will only apply to said minion.
+In states
+---------
+
+The second way to enable aggregation is with the state-level ``aggregate``
+keyword. In this configuration, Salt will invoke the ``mod_aggregate`` function
+the first time it encounters this keyword. Any additional occurances of the
+keyword will be ignored as the aggregation has already taken place.
+
+The following example will trigger ``mod_aggregate`` when the ``lamp_stack``
+state is processed resulting in a single call to the underlying package
+manager.
+
+.. code-block:: yaml
+
+    lamp_stack:
+      pkg.installed:
+        - pkgs:
+          - php
+          - mysql-client
+        - aggregate: True
+
+    memcached:
+      pkg.installed:
+        - name: memcached
 
 Adding mod_aggregate to a State Module
 ======================================