diff --git a/changes/port_doc b/changes/port_doc
new file mode 100644
index 0000000000000000000000000000000000000000..0e8662f0ab5a6f918059e04dc42cd5a86bba3755
--- /dev/null
+++ b/changes/port_doc
@@ -0,0 +1,3 @@
+  o Minor features (usability):
+    - Try to make the warning when giving an obsolete SOCKSListenAddress
+      a littel more useful.
diff --git a/src/or/config.c b/src/or/config.c
index f5b5c8fb58a4cb6f4cc2a2b99aca86f360514bb7..bacb06ee9933b606c3d73a31f6852ba797de37cf 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out,
         mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL);
         if (!ok) {
           log_warn(LD_CONFIG, "%sListenAddress can only be used with a single "
-                   "%sPort with value \"auto\" or 1-65535.",
+                   "%sPort with value \"auto\" or 1-65535 and no options set.",
                    portname, portname);
           return -1;
         }