diff --git a/Misc/ACKS b/Misc/ACKS
index 209e285..2ea2322 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -357,6 +357,7 @@
 Thomas Gellekum
 Gabriel Genellina
 Christos Georgiou
+Elazar Gershuni
 Ben Gertzfield
 Nadim Ghaznavi
 Dinu Gherman
diff --git a/Misc/NEWS b/Misc/NEWS
index 3d07704..481e901 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,10 @@
 Library
 -------
 
+- Issue #13107: argparse and optparse no longer raises an exception when output
+  a help on environment with too small COLUMNS.  Based on patch by
+  Elazar Gershuni.
+
 - Issue #20207: Always disable SSLv2 except when PROTOCOL_SSLv2 is explicitly
   asked for.