diff --git a/library/Icinga/Cli/Documentation/CommentParser.php b/library/Icinga/Cli/Documentation/CommentParser.php
index 3d56e17d6..410484897 100644
--- a/library/Icinga/Cli/Documentation/CommentParser.php
+++ b/library/Icinga/Cli/Documentation/CommentParser.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Cli\Documentation;
 
+use Icinga\Cli\Screen;
+
 class CommentParser
 {
     protected $raw;
@@ -75,7 +77,7 @@ class CommentParser
         }
 
         foreach ($this->paragraphs as $p) {
-            $res .= wordwrap($p, 72) . "\n\n";
+            $res .= wordwrap($p, Screen::instance()->getColumns()) . "\n\n";
         }
 
         return $res;