diff --git a/dmtree/tr181/managementserver.c b/dmtree/tr181/managementserver.c
index f6ac591f..23d1fe62 100644
--- a/dmtree/tr181/managementserver.c
+++ b/dmtree/tr181/managementserver.c
@@ -478,7 +478,7 @@ static void get_management_ip_port(char **listen_addr)
 	}
 
 	if (ip[0] != '\0' && port[0] != '\0') {
-		dmasprintf(listen_addr, "%s:%s", ip, port);
+		dmasprintf(listen_addr, (*version == '6') ? "[%s]:%s" : "%s:%s", ip, port);
 	}
 }