diff --git a/doc/rvctl.md b/doc/rvctl.md
index 07a4c05..7044b32 100644
--- a/doc/rvctl.md
+++ b/doc/rvctl.md
@@ -304,9 +304,9 @@ Typowy wynik:
 
 ```text
 tokens
-item  server  proto  host           port   org        repo         user  remote  token_ref  token         valid  scope   org     repo
-----  ------  -----  -------------  -----  ---------  -----------  ----  ------  ---------  ------------  -----  awrop-  oawrc-  oawr--
-1     gitea   http   77.90.8.171    3001   edu-tools  rv-launcher  u1    r1      t1      *  e59cc...13be  +      +---+   +++++   ++++
+item  server  proto  host                org        repo         user  remote  token_ref  token         valid  scope   org     repo
+----  ------  -----  ------------------  ---------  -----------  ----  ------  ---------  ------------  -----  awrop-  oawrc-  oawr--
+1     gitea   http   77.90.8.171:3001    edu-tools  rv-launcher  u1    r1      t1      *  e59cc...13be  +      +---+   +++++   ++++
 ```
 
 `token_ref` jest komorka stalej szerokosci: nazwa tokena jest po lewej, a marker
@@ -383,9 +383,9 @@ repo_root<TAB>...
 token_path<TAB>...
 
 tokens
-item  server  proto  host           port   org        repo         user  remote  token_ref  token         valid  scope   org     repo
-----  ------  -----  -------------  -----  ---------  -----------  ----  ------  ---------  ------------  -----  awrop-  oawrc-  oawr--
-1     gitea   http   77.90.8.171    3001   edu-tools  rv-launcher  u1    r1      t1      *  e59cc...13be  +      +---+   +++++   ++++
+item  server  proto  host                org        repo         user  remote  token_ref  token         valid  scope   org     repo
+----  ------  -----  ------------------  ---------  -----------  ----  ------  ---------  ------------  -----  awrop-  oawrc-  oawr--
+1     gitea   http   77.90.8.171:3001    edu-tools  rv-launcher  u1    r1      t1      *  e59cc...13be  +      +---+   +++++   ++++
 
 status
 item<TAB>value
diff --git a/doc/tokens.md b/doc/tokens.md
index 670b96a..07dd0ed 100644
--- a/doc/tokens.md
+++ b/doc/tokens.md
@@ -105,8 +105,7 @@ Kolumny w tabeli `tokens`:
 - `item` - numer wiersza tokena
 - `server` - typ serwera, na przyklad `gitea`
 - `proto` - protokol endpointu, na przyklad `http`
-- `host` - host endpointu, na przyklad `77.90.8.171`
-- `port` - port endpointu, na przyklad `3001`
+- `host` - host endpointu razem z portem, na przyklad `77.90.8.171:3001`
 - `org` - organizacja z remote URL
 - `repo` - repo z remote URL
 - `user` - login wlasciciela tokena
diff --git a/rvctl.py b/rvctl.py
index 367fb31..ab89ff0 100644
--- a/rvctl.py
+++ b/rvctl.py
@@ -717,8 +717,7 @@ TOKEN_COLUMNS = [
     ("item", "item", 4),
     ("server", "server", 6),
     ("proto", "proto", 5),
-    ("host", "host", 13),
-    ("port", "port", 5),
+    ("host", "host", 18),
     ("owner", "org", 9),
     ("repo_name", "repo", 11),
     ("user", "user", 4),
@@ -792,6 +791,8 @@ def endpoint_column_values(endpoint: str, repo_entry: dict | None, store_entry:
     values["host"] = values["host"] or (split_endpoint.hostname or "")
     if not values["port"] and split_endpoint.port is not None:
         values["port"] = str(split_endpoint.port)
+    if values["host"] and values["port"]:
+        values["host"] = f"{values['host']}:{values['port']}"
     return values
 
 
@@ -1032,7 +1033,6 @@ def print_token_item_rows(
                 "server": endpoint_values["server"],
                 "proto": endpoint_values["scheme"],
                 "host": endpoint_values["host"],
-                "port": endpoint_values["port"],
                 "owner": owner,
                 "repo_name": repo_name,
                 "user": user_name,