diff --git a/src/bin/bind10/bind10.py.in b/src/bin/bind10/bind10.py.in
index babd339f58ca9ab430e52d4f422aaede456b61a9..579cae6eda3d4bd341025f8c21d519c3afed1825 100644
--- a/src/bin/bind10/bind10.py.in
+++ b/src/bin/bind10/bind10.py.in
@@ -118,6 +118,7 @@ class ProcessInfo:
             spawn_env['PYTHON_EXEC'] = os.environ['PYTHON_EXEC']
         if 'PYTHONPATH' in os.environ:
             spawn_env['PYTHONPATH'] = os.environ['PYTHONPATH']
+        spawn_env['ISC_MSGQ_PORT'] = self.c_channel_port
         self.process = subprocess.Popen(self.args,
                                         stdin=subprocess.PIPE,
                                         stdout=spawn_stdout,
diff --git a/src/lib/python/isc/cc/session.py b/src/lib/python/isc/cc/session.py
index 667d2a492f2bee232f4ae1bc5847d5dac63a1c3e..3bd99581f8abcb56e6b96d94827117b25a848bba 100644
--- a/src/lib/python/isc/cc/session.py
+++ b/src/lib/python/isc/cc/session.py
@@ -35,10 +35,10 @@ class Session:
         self._queue = []
 
         if port == 0:
-	  if 'B10_FROM_SOURCE' in os.environ:
-	    port = int(os.environ["ISC_MSGQ_PORT"])
-	  else:
-	    port = 9912
+	        if 'B10_FROM_SOURCE' in os.environ:
+	            port = int(os.environ["ISC_MSGQ_PORT"])
+	        else:
+	            port = 9912
 
         try:
             self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)