diff --git a/changes/feature3439 b/changes/feature3439
new file mode 100644
index 0000000000..ee8c6f2ce6
--- /dev/null
+++ b/changes/feature3439
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Add port 6523 (Gobby) to LongLivedPorts. Patch by intrigeri;
+      implements ticket 3439.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7d72350eb8..6454e6be48 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -651,7 +651,7 @@ The following options are useful only for clients (that is, if
     (e.g. chat and interactive shells). Circuits for streams that use these
     ports will contain only high-uptime nodes, to reduce the chance that a node
     will go down before the stream is finished. (Default: 21, 22, 706, 1863,
-    5050, 5190, 5222, 5223, 6667, 6697, 8300)
+    5050, 5190, 5222, 5223, 6523, 6667, 6697, 8300)
 
 **MapAddress** __address__ __newaddress__::
     When a request for address arrives to Tor, it will rewrite it to newaddress
diff --git a/src/or/config.c b/src/or/config.c
index ca0d9b0503..c88504681c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -310,7 +310,7 @@ static config_var_t _option_vars[] = {
   OBSOLETE("LogFile"),
   V(LogTimeGranularity,          MSEC_INTERVAL, "1 second"),
   V(LongLivedPorts,              CSV,
-                         "21,22,706,1863,5050,5190,5222,5223,6667,6697,8300"),
+                         "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"),
   VAR("MapAddress",              LINELIST, AddressMap,           NULL),
   V(MaxAdvertisedBandwidth,      MEMUNIT,  "1 GB"),
   V(MaxCircuitDirtiness,         INTERVAL, "10 minutes"),