diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index f0bb83bc..133750bb 100644
--- a/exec/totemconfig.c
+++ b/exec/totemconfig.c
@@ -846,7 +846,7 @@ static void reconfigure_links(struct totem_config *totem_config)
 		if (!totem_config->interfaces[i].knet_transport)
 			totem_config->interfaces[i].knet_transport = KNET_TRANSPORT_UDP;
 		if (!totem_config->interfaces[i].ip_port)
-			totem_config->interfaces[i].ip_port = DEFAULT_PORT;
+			totem_config->interfaces[i].ip_port = DEFAULT_PORT + i;
 
 		totempg_iface_set(&local_ip, totem_config->interfaces[i].ip_port, i);
 	}
@@ -1226,7 +1226,7 @@ static int get_interface_params(struct totem_config *totem_config,
 				if (totem_config->broadcast_use) {
 					totem_config->interfaces[linknumber].ip_port = DEFAULT_PORT + (2 * linknumber);
 				} else {
-					totem_config->interfaces[linknumber].ip_port = DEFAULT_PORT;
+					totem_config->interfaces[linknumber].ip_port = DEFAULT_PORT + linknumber;
 				}
 			}
 
diff --git a/exec/totemknet.c b/exec/totemknet.c
index 7036e5b3..dd3feb9a 100644
--- a/exec/totemknet.c
+++ b/exec/totemknet.c
@@ -1159,8 +1159,8 @@ int totemknet_member_add (
 
 	memset(&local_ss, 0, sizeof(local_ss));
 	/* Casts to remove const */
-	totemip_totemip_to_sockaddr_convert((struct totem_ip_address *)member, port+link_no, &remote_ss, &addrlen);
-	totemip_totemip_to_sockaddr_convert((struct totem_ip_address *)local, port+link_no, &local_ss, &addrlen);
+	totemip_totemip_to_sockaddr_convert((struct totem_ip_address *)member, port, &remote_ss, &addrlen);
+	totemip_totemip_to_sockaddr_convert((struct totem_ip_address *)local, port, &local_ss, &addrlen);
 	if (member->nodeid == instance->our_nodeid) {
 		err = knet_link_set_config(instance->knet_handle, member->nodeid, link_no,
 					   KNET_TRANSPORT_LOOPBACK,