diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
index 8ac771f56b..f7a450bf01 100644
--- a/doc/ref/configuration/master.rst
+++ b/doc/ref/configuration/master.rst
@@ -96,8 +96,8 @@ The user to run the Salt processes
 
 .. conf_master:: ret_port
 
-``enable_ssh``
---------------
+``enable_ssh_minions``
+----------------------
 
 Default: ``False``
 
@@ -105,8 +105,12 @@ Tell the master to also use SaltSSH when running commands against minions.
 
 .. code-block:: yaml
 
-    enable_ssh: True
-    
+    enable_ssh_minions: True
+
+.. note::
+
+    Cross minion type communication is still not possible.  The SaltMine and
+    publish.publish do not work between minion types.
 
 ``ret_port``
 ------------
diff --git a/salt/config/__init__.py b/salt/config/__init__.py
index 284d071839..950c3d3cbd 100644
--- a/salt/config/__init__.py
+++ b/salt/config/__init__.py
@@ -1185,7 +1185,7 @@ VALID_OPTS = {
     'schedule': dict,
 
     # Enable calling ssh minions from the salt master
-    'enable_ssh': bool,
+    'enable_ssh_minions': bool,
 }
 
 # default configurations
@@ -1803,6 +1803,7 @@ DEFAULT_MASTER_OPTS = {
     },
     'schedule': {},
     'enable_ssh': False,
+    'enable_ssh_minions': False,
 }
 
 
diff --git a/salt/master.py b/salt/master.py
index 7cc46c2198..8bf2088c9a 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -1958,7 +1958,7 @@ class ClearFuncs(object):
         payload = self._prep_pub(minions, jid, clear_load, extra, missing)
 
         # Send it!
-        if self.opts[u'enable_ssh'] is True:
+        if self.opts[u'enable_ssh_minions'] is True:
             log.debug('Use SSHClient for rostered minions')
             ssh = salt.client.ssh.client.SSHClient()
             ssh_minions = ssh._prep_ssh(**clear_load).targets.keys()