--- ./options_description.cpp.org	2010-09-12 02:01:54.000000000 -0400
+++ ./options_description.cpp	2010-09-12 02:26:56.000000000 -0400
@@ -174,10 +174,12 @@
     option_description::format_name() const
     {
         if (!m_short_name.empty())
-            return string(m_short_name).append(" [ --").
+        {
+            return m_long_name.empty() ? m_short_name :
+            string(m_short_name).append(" [ --").
             append(m_long_name).append(" ]");
-        else
-            return string("--").append(m_long_name);
+        }
+        return string("--").append(m_long_name);
     }
 
     std::string