diff --git a/src/invitation.c b/src/invitation.c
index cdef3d04..63a443d4 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -197,8 +197,10 @@ done:
 		else
 			xasprintf(&hostport, "%s:%s", hostname, port);
 	} else {
-		hostport = hostname;
-		hostname = NULL;
+		if(strchr(hostname, ':'))
+			xasprintf(&hostport, "[%s]", hostname);
+		else
+			hostport = xstrdup(hostname);
 	}
 
 	free(hostname);