diff --git a/src/python/oftest/help_formatter.py b/src/python/oftest/help_formatter.py
new file mode 100644
index 0000000..0e0a7c9
--- /dev/null
+++ b/src/python/oftest/help_formatter.py
@@ -0,0 +1,10 @@
+import optparse
+
+# Don't wrap description text to give us more control over newlines.
+class HelpFormatter(optparse.IndentedHelpFormatter):
+    def format_description(self, description):
+        if description:
+            indent = " "*self.current_indent
+            return indent + description
+        else:
+            return none