diff --git a/changes/bug24115 b/changes/bug24115
new file mode 100644
index 0000000000..767f13840b
--- /dev/null
+++ b/changes/bug24115
@@ -0,0 +1,4 @@
+  o Minor bugfixes (manpage, hidden service):
+    - Mention that the HiddenServiceNumIntroductionPoints option is 0-10 for
+      v2 service and 0-20 for v3 service. Fixes bug 24115; bugfix on
+      0.3.2.1-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index e76efddcd5..86999667a5 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2445,7 +2445,7 @@ The following options are used to configure a hidden service.
 
 [[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** __NUM__::
     Number of introduction points the hidden service will have. You can't
-    have more than 10. (Default: 3)
+    have more than 10 for v2 service and 20 for v3. (Default: 3)
 
 [[HiddenServiceSingleHopMode]] **HiddenServiceSingleHopMode** **0**|**1**::
     **Experimental - Non Anonymous** Hidden Services on a tor instance in