diff --git a/nodelist b/nodelist
index 3622ea5..85085d2 100644
--- a/nodelist
+++ b/nodelist
@@ -1,10 +1,10 @@
-team,tilde.team
-voyage,cosmic.voyage
-center,tilde.center
-dataforge,uucp.dataforge.tk
-institute,tilde.institute
-aussie,aussies.space
-epfl,uucp.cothority.net
-frostbyte,uucp.frostbyte.cc
-radiofreqs,radiofreqs.space
-caconym,dgold.eu
+team,tilde.team,22
+voyage,cosmic.voyage,22
+center,tilde.center,22
+dataforge,uucp.dataforge.tk,22
+institute,tilde.institute,22
+aussie,aussies.space,22
+epfl,uucp.cothority.net,22
+frostbyte,uucp.frostbyte.cc,22
+radiofreqs,radiofreqs.space,22
+caconym,dgold.eu,22
diff --git a/utils/bootstrap.pl b/utils/bootstrap.pl
index 84a7419..86c3474 100755
--- a/utils/bootstrap.pl
+++ b/utils/bootstrap.pl
@@ -35,7 +35,8 @@ sub getNodes {
 		#$nodeName eq $myNode && continue
 
 		my $nodeAddress = $fields[1];
-		generatePort($nodeName,$nodeAddress); 
+                my $nodePort = $fields[2];
+		generatePort($nodeName,$nodeAddress,$nodePort); 
 		generateSys($nodeName);
 		generateCall($nodeName);
 		generatePasswd($nodeName);
@@ -52,13 +53,14 @@ sub generatePort {
 
 	my $nodeName = shift;
 	my $nodeAddress = shift;
+        my $nodePort = shift;
 
 	my $currentNode = ucfirst($nodeName);
 
 	my $template = qq{
 		port $currentNode
 		type pipe
-		command /usr/bin/ssh -a -x -q -i /var/spool/uucp/.ssh/id_rsa -l uucp $nodeAddress
+		command /usr/bin/ssh -a -x -q -i /var/spool/uucp/.ssh/id_rsa -l uucp -p $nodePort $nodeAddress
 		reliable true
 		protocol etyig
 	};