diff --git a/build.gradle b/build.gradle
index 2e64ecea92..192be3b11c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
 import org.objectweb.asm.ClassReader
 
 plugins {
-    id 'org.ajoberstar.grgit' version '3.1.1'
+    id 'org.ajoberstar.grgit' version '4.1.1'
     id 'de.undercouch.download' version '3.3.0'
     id 'com.github.ben-manes.versions' version '0.22.0'
     id 'eclipse'
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 1f100a763e..ed216b5b46 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -162,7 +162,7 @@ public static OptionSet main(String[] args) {
             Logger.getLogger(Main.class.getName()).log(Level.SEVERE, ex.getLocalizedMessage());
         }
 
-        if ((options == null) || (options.has("?"))) {
+        if ((options == null) || (options.has("?") || (options.has("help"))) {
             try {
                 parser.printHelpOn(System.out);
             } catch (IOException ex) {