diff --git a/src/app/parser.rs b/src/app/parser.rs
index d0cdae9ee70..e26cb0f88e2 100644
--- a/src/app/parser.rs
+++ b/src/app/parser.rs
@@ -206,6 +206,13 @@ impl<'a, 'b> Parser<'a, 'b>
             self.set(AS::DontCollapseArgsInUsage);
             self.set(AS::ContainsLast);
         }
+        if let Some(l) = a.s.long {
+            if l == "version" {
+                self.unset(AS::NeedsLongVersion);
+            } else if l == "help" {
+                self.unset(AS::NeedsLongHelp);
+            }
+        }
     }
 
     // actually adds the arguments