diff --git a/example-conf.yml b/example-conf.yml
index a33c16d..e265c59 100644
--- a/example-conf.yml
+++ b/example-conf.yml
@@ -454,6 +454,11 @@ servers:
         # and earlier.
         #ircd: charybdis
 
+        # Determines whether PyLink servers should be marked hidden in /links and /map.
+        # This only takes effect if the 'flatten_links' option in the IRCd is enabled.
+        # Defaults to false if not set.
+        #hidden: false
+
     # Sample Clientbot configuration, if you want to connect PyLink as a bot to relay somewhere
     # (or do other bot things).
     magicnet:
diff --git a/protocols/ts6.py b/protocols/ts6.py
index a326664..688f894 100644
--- a/protocols/ts6.py
+++ b/protocols/ts6.py
@@ -91,6 +91,19 @@ class TS6Protocol(TS6BaseProtocol):
 
         return u
 
+    def spawn_server(self, name, sid=None, uplink=None, desc=None):
+        """
+        Spawns a server off a PyLink server. desc (server description)
+        defaults to the one in the config. uplink defaults to the main PyLink
+        server, and sid (the server ID) is automatically generated if not
+        given.
+        """
+        desc = desc or self.serverdata.get('serverdesc') or conf.conf['pylink']['serverdesc']
+        if self.serverdata.get('hidden', False):
+            desc = '(H) ' + desc
+
+        return super().spawn_server(name, sid=sid, uplink=uplink, desc=desc)
+
     def join(self, client, channel):
         """Joins a PyLink client to a channel."""
         # JOIN:
@@ -398,8 +411,10 @@ class TS6Protocol(TS6BaseProtocol):
         # KLN: supports remote KLINEs
         f('CAPAB :QS ENCAP EX CHW IE KNOCK SAVE SERVICES TB EUID RSFNC EOPMOD SAVETS_100 KLN')
 
-        f('SERVER %s 0 :%s' % (self.serverdata["hostname"],
-                               self.serverdata.get('serverdesc') or conf.conf['pylink']['serverdesc']))
+        sdesc = self.serverdata.get('serverdesc') or conf.conf['pylink']['serverdesc']
+        if self.serverdata.get('hidden', False):
+            sdesc = '(H) ' + sdesc
+        f('SERVER %s 0 :%s' % (self.serverdata["hostname"], sdesc))
 
         # Finally, end all the initialization with a PING - that's Charybdis'
         # way of saying end-of-burst :)