diff --git a/hsflowd.spec b/hsflowd.spec
index a71ade32..d505686a 100644
--- a/hsflowd.spec
+++ b/hsflowd.spec
@@ -1,7 +1,7 @@
 Summary: host sFlow daemon
 Name: hsflowd
 Version: 2.0.26
-Release: 6
+Release: 7
 License: http://sflow.net/license.html
 Group: Applications/Internet
 URL: http://sflow.net
diff --git a/src/Linux/hsflowconfig.c b/src/Linux/hsflowconfig.c
index 76b9310e..12b4653b 100644
--- a/src/Linux/hsflowconfig.c
+++ b/src/Linux/hsflowconfig.c
@@ -622,8 +622,12 @@ extern "C" {
 	// so let's hope the slave agents all do the right thing with that(!)
 	if(collector->ipAddr.type != SFLADDRESSTYPE_UNDEFINED) {
 	  char collectorStr[128];
-	  // <ip> <port> [<priority>]
-	  sprintf(collectorStr, "collector=%s %u\n", SFLAddress_print(&collector->ipAddr, ipbuf, 50), collector->udpPort);
+	  // ip/port/deviceName/namespace
+	  sprintf(collectorStr, "collector=%s/%u/%s/%s\n",
+		  SFLAddress_print(&collector->ipAddr, ipbuf, 50),
+		  collector->udpPort,
+		  collector->deviceName ?: "",
+		  collector->namespace ?: "");
 	  strArrayAdd(iplist, collectorStr);
 	}
       }