diff --git a/HACKING.rst b/HACKING.rst
index e6fc5517f4..4c2a0b3017 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -213,6 +213,9 @@ Edit the minion config file:
 4.  Uncomment and change the ``id:`` value to something descriptive like
     "saltdev". This isn't strictly necessary but it will serve as a reminder of
     which Salt installation you are working with.
+5.  If you changed the ``ret_port`` value in the master config because you are
+    also running a non-development version of Salt, then you will have to
+    change the ``master_port`` value in the minion config to match.
 
 .. note:: Using `salt-call` with a :doc:`Standalone Minion </topics/tutorials/standalone_minion>`
 
diff --git a/doc/topics/hacking.rst b/doc/topics/hacking.rst
index ba93a5a427..03a23e7da6 100644
--- a/doc/topics/hacking.rst
+++ b/doc/topics/hacking.rst
@@ -267,6 +267,9 @@ Edit the minion config file:
 4.  Uncomment and change the ``id:`` value to something descriptive like
     "saltdev". This isn't strictly necessary but it will serve as a reminder of
     which Salt installation you are working with.
+5.  If you changed the ``ret_port`` value in the master config because you are
+    also running a non-development version of Salt, then you will have to
+    change the ``master_port`` value in the minion config to match.
 
 .. note:: Using `salt-call` with a :doc:`Standalone Minion </topics/tutorials/standalone_minion>`