diff --git a/plugins/autopeering/autopeering.go b/plugins/autopeering/autopeering.go
index 7dc06d78d699447768f94c1be63c1d69ade05542..314459ed66d7ac987b4dbab66f3cf0b2cbd49115 100644
--- a/plugins/autopeering/autopeering.go
+++ b/plugins/autopeering/autopeering.go
@@ -82,12 +82,12 @@ func configureAP() {
 		log.Fatalf("ListenUDP: %v", err)
 	}
 
-	masterPeers := []*peer.Peer{}
-	master, err := parseEntryNodes()
+	var masterPeers []*peer.Peer
+	peers, err := parseEntryNodes()
 	if err != nil {
 		log.Fatalf("Ignoring entry nodes: %v\n", err)
-	} else if master != nil {
-		masterPeers = master
+	} else if peers != nil {
+		masterPeers = peers
 	}
 
 	// use the UDP connection for transport
diff --git a/plugins/autopeering/entrynodes.go b/plugins/autopeering/entrynodes.go
index 0dc486273983562c84789e3e8e9900bbc1d5e177..1b4384d37d865eec8aee598b742ff7281df33f33 100644
--- a/plugins/autopeering/entrynodes.go
+++ b/plugins/autopeering/entrynodes.go
@@ -11,7 +11,7 @@ import (
 )
 
 func parseEntryNodes() (result []*peer.Peer, err error) {
-	for _, entryNodeDefinition := range strings.Fields(parameter.NodeConfig.GetString(CFG_ENTRY_NODES)) {
+	for _, entryNodeDefinition := range parameter.NodeConfig.GetStringSlice(CFG_ENTRY_NODES) {
 		if entryNodeDefinition == "" {
 			continue
 		}
diff --git a/plugins/autopeering/parameters.go b/plugins/autopeering/parameters.go
index e5b2c7f29178a9102031553d36c61d5f0dcab960..27b117006e402cc47d0d92f8c5ca8e3bedd97edf 100644
--- a/plugins/autopeering/parameters.go
+++ b/plugins/autopeering/parameters.go
@@ -13,7 +13,7 @@ const (
 
 func init() {
 	flag.String(CFG_ADDRESS, "0.0.0.0", "address to bind for incoming peering requests")
-	flag.String(CFG_ENTRY_NODES, "V8LYtWWcPYYDTTXLeIEFjJEuWlsjDiI0+Pq/Cx9ai6g=@116.202.49.178:14626", "list of trusted entry nodes for auto peering")
+	flag.StringSlice(CFG_ENTRY_NODES, []string{"V8LYtWWcPYYDTTXLeIEFjJEuWlsjDiI0+Pq/Cx9ai6g=@116.202.49.178:14626"}, "list of trusted entry nodes for auto peering")
 	flag.Int(CFG_PORT, 14626, "udp port for incoming peering requests")
 	flag.Bool(CFG_SELECTION, true, "enable peer selection")
 }