diff --git a/ndb/include/transporter/TransporterDefinitions.hpp b/ndb/include/transporter/TransporterDefinitions.hpp
index a8da8068552..4ff6b2073eb 100644
--- a/ndb/include/transporter/TransporterDefinitions.hpp
+++ b/ndb/include/transporter/TransporterDefinitions.hpp
@@ -68,6 +68,8 @@ struct TCP_TransporterConfiguration {
  */
 struct SHM_TransporterConfiguration {
   Uint32 port; 
+  const char *remoteHostName;
+  const char *localHostName;
   NodeId remoteNodeId;
   NodeId localNodeId;
   bool checksum;
diff --git a/ndb/src/common/mgmcommon/IPCConfig.cpp b/ndb/src/common/mgmcommon/IPCConfig.cpp
index 780504d2c62..1da03e3eaf2 100644
--- a/ndb/src/common/mgmcommon/IPCConfig.cpp
+++ b/ndb/src/common/mgmcommon/IPCConfig.cpp
@@ -383,6 +383,8 @@ IPCConfig::configureTransporters(Uint32 nodeId,
       if(iter.get(CFG_SHM_BUFFER_MEM, &conf.shmSize)) break;
       
       conf.port= server_port;
+      conf.localHostName  = localHostName;
+      conf.remoteHostName = remoteHostName;
 
       if(!tr.createTransporter(&conf)){
         DBUG_PRINT("error", ("Failed to create SHM Transporter from %d to %d",
diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/ndb/src/common/transporter/TransporterRegistry.cpp
index be51e9223ba..394c7cd490d 100644
--- a/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/ndb/src/common/transporter/TransporterRegistry.cpp
@@ -358,8 +358,8 @@ TransporterRegistry::createTransporter(SHM_TransporterConfiguration *config) {
     return false;
 
   SHM_Transporter * t = new SHM_Transporter(*this,
-					    "localhost",
-					    "localhost",
+					    config->localHostName,
+					    config->remoteHostName,
 					    config->port,
 					    localNodeId,
 					    config->remoteNodeId,