diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8fccc544..94c6e71d 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -50,3 +50,6 @@
 
 ### Rikko
 - Created the original "reject_recently_left_players" plugin
+
+### brostos
+- Added support for joining using ipv6 address
diff --git a/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py b/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py
index d7f3205e..f45bb081 100644
--- a/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py
+++ b/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py
@@ -48,7 +48,7 @@ class _HostLookupThread(Thread):
         try:
             import socket
 
-            result = socket.gethostbyname(self._name)
+            result = [item[-1][0] for item in socket.getaddrinfo(self.name, self._port)][0]
         except Exception:
             result = None
         bui.pushcall(