diff --git a/README.md b/README.md
index 20cd0b5a7..8f8d0fb16 100644
--- a/README.md
+++ b/README.md
@@ -203,6 +203,9 @@ Chunky uses the following 3rd party libraries:
 - **Apache Maven Artifact by the Apache Software Foundation**  
   The library is covered by the Apache License, version 2.0.
   See the file `licenses/Apache-2.0.txt` for the full license text.
+- **Apache Commons CLI by the Apache Software Foundation**  
+  The library is covered by the Apache License, version 2.0.
+  See the file `licenses/Apache-2.0.txt` for the full license text.
 - **FastUtil by Sebastiano Vigna**  
   FastUtil is covered by Apache License, version 2.0.
   See the file `licenses/Apache-2.0.txt` for the full license text.
diff --git a/chunky/src/java/se/llbit/chunky/ui/controller/CreditsController.java b/chunky/src/java/se/llbit/chunky/ui/controller/CreditsController.java
index 6b38a46fd..d491ed296 100644
--- a/chunky/src/java/se/llbit/chunky/ui/controller/CreditsController.java
+++ b/chunky/src/java/se/llbit/chunky/ui/controller/CreditsController.java
@@ -40,6 +40,7 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
+import se.llbit.chunky.HelpCopyright;
 import se.llbit.chunky.main.Chunky;
 import se.llbit.chunky.plugin.PluginApi;
 import se.llbit.chunky.ui.ChunkyFx;
@@ -49,10 +50,11 @@
 import se.llbit.util.Pair;
 
 public class CreditsController implements Initializable {
-
   @FXML
   private Label version;
   @FXML
+  public Label copyrightLine;
+  @FXML
   private Hyperlink gplv3;
   @FXML
   private Hyperlink markdown;
@@ -83,6 +85,10 @@ public class CreditsController implements Initializable {
   @FXML
   private Hyperlink lz4JavaLicense;
   @FXML
+  private Hyperlink apacheCli;
+  @FXML
+  private Hyperlink apacheCliLicense;
+  @FXML
   private VBox pluginBox;
   @FXML
   private ImageView logoImage;
@@ -140,6 +146,8 @@ public void initialize(URL location, ResourceBundle resources) {
 
     version.setText(Chunky.getMainWindowTitle());
 
+    copyrightLine.setText(HelpCopyright.COPYRIGHT_LINE);
+
     gplv3.setOnAction(
         e -> launchAndReset(gplv3, "https://github.com/chunky-dev/chunky/blob/master/LICENSE")
     );
@@ -189,6 +197,11 @@ public void initialize(URL location, ResourceBundle resources) {
     lz4JavaLicense.setBorder(Border.EMPTY);
     lz4JavaLicense.setOnAction(e -> launchAndReset(lz4JavaLicense, "https://github.com/lz4/lz4-java/blob/master/LICENSE.txt"));
 
+    apacheCli.setBorder(Border.EMPTY);
+    apacheCli.setOnAction(e -> launchAndReset(apacheCli, "https://commons.apache.org/proper/commons-cli/"));
+    apacheCliLicense.setBorder(Border.EMPTY);
+    apacheCliLicense.setOnAction(e -> launchAndReset(apacheCliLicense, "http://www.apache.org/licenses/LICENSE-2.0"));
+
     if (!plugins.isEmpty()) {
       plugins.forEach((key, item) -> pluginBox.getChildren().addAll(buildBox(item)));
     } else {
diff --git a/chunky/src/res/se/llbit/chunky/ui/dialogs/Credits.fxml b/chunky/src/res/se/llbit/chunky/ui/dialogs/Credits.fxml
index bbc38015e..e3227eba3 100644
--- a/chunky/src/res/se/llbit/chunky/ui/dialogs/Credits.fxml
+++ b/chunky/src/res/se/llbit/chunky/ui/dialogs/Credits.fxml
@@ -31,7 +31,7 @@
                     <Font name="System Bold" size="14.0"/>
                   </font>
                 </Label>
-                <Label text="Copyright (c) 2010-2024, Jesper Öqvist and Chunky contributors." wrapText="true">
+                <Label fx:id="copyrightLine" text="Copyright (c) 2010-2024, Jesper Öqvist and Chunky contributors" wrapText="true">
                   <padding>
                     <Insets top="10.0"/>
                   </padding>
@@ -249,6 +249,20 @@
                         <Insets left="20.0" />
                       </padding>
                     </Hyperlink>
+
+                    <Hyperlink fx:id="apacheCli" text="Apache Commons CLI">
+                      <padding>
+                        <Insets/>
+                      </padding>
+                    </Hyperlink>
+                    <Hyperlink fx:id="apacheCliLicense" text="Apache License 2.0">
+                      <font>
+                        <Font size="10.0"/>
+                      </font>
+                      <padding>
+                        <Insets left="20.0"/>
+                      </padding>
+                    </Hyperlink>
                   </children>
                 </VBox>
               </children>
diff --git a/launcher/build.gradle b/launcher/build.gradle
index da183b841..675b1e2c8 100644
--- a/launcher/build.gradle
+++ b/launcher/build.gradle
@@ -9,9 +9,13 @@ configurations {
 }
 
 dependencies {
-    bundled 'org.apache.maven:maven-artifact:3.9.9'
+  bundled 'org.apache.maven:maven-artifact:3.9.9'
+  bundled 'commons-cli:commons-cli:1.6.0'
 
-    implementation project(':lib')
+  implementation project(':lib')
+
+  testImplementation 'com.google.truth:truth:1.1.3'
+  testImplementation 'junit:junit:4.13.2'
 }
 
 java {
@@ -21,13 +25,22 @@ java {
   }
 }
 
-sourceSets.main {
-    java.srcDir 'src'
+sourceSets {
+  main {
+    java {
+      srcDir 'src'
+    }
     resources {
-        srcDir 'src'
-        include '**/*.png'
-        include '**/*.fxml'
+      srcDir 'src'
+      include '**/*.png'
+      include '**/*.fxml'
     }
+  }
+  test {
+    java {
+      srcDir 'test'
+    }
+  }
 }
 
 jar {
diff --git a/launcher/src/se/llbit/chunky/launcher/ChunkyLauncher.java b/launcher/src/se/llbit/chunky/launcher/ChunkyLauncher.java
index 5ac27bb12..8d0f4cbf3 100644
--- a/launcher/src/se/llbit/chunky/launcher/ChunkyLauncher.java
+++ b/launcher/src/se/llbit/chunky/launcher/ChunkyLauncher.java
@@ -20,7 +20,9 @@
 import javafx.stage.Stage;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.commons.cli.*;
 import se.llbit.chunky.PersistentSettings;
+import se.llbit.chunky.cli.CliUtil;
 import se.llbit.chunky.launcher.ui.ChunkyLauncherFx;
 import se.llbit.chunky.launcher.ui.DebugConsole;
 import se.llbit.chunky.launcher.ui.FirstTimeSetupDialog;
@@ -51,13 +53,91 @@ public class ChunkyLauncher {
 
   public static final int LAUNCHER_SETTINGS_REVISION = 1;
 
-  /**
-   * Print a launch error message to the console.
-   * Prints the command that was used to try to launch Chunky.
-   */
-  protected static void launchFailure(String command) {
-    System.out.println("Failed to launch Chunky. Command used:");
-    System.out.println(command);
+  public static Options cliOptionsPublic() {
+    Options options = new Options();
+
+    options.addOption(Option.builder()
+      .option("h")
+      .longOpt("help")
+      .desc("Show this help message")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("launcher")
+      .desc("Forces the launcher GUI to be shown")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("version")
+      .desc("Show the launcher version and exit")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("verbose")
+      .desc("Enables verbose logging")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("console")
+      .desc("Forces debug console to be opened")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("update")
+      .argName("release channel")
+      .optionalArg(true)
+      .desc("Update Chunky to the latest release")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("setup")
+      .desc("Runs the interactive command-line launcher setup")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("javaOptions")
+      .hasArg(true)
+      .argName("options")
+      .desc("Add a Java option when launching Chunky")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("dangerouslyDisableLibraryValidation")
+      .desc("Disable library validation. This can be dangerous!")
+      .build()
+    );
+
+    return options;
+  }
+
+  public static Options cliOptionsFull() {
+    Options options = cliOptionsPublic();
+
+    options.addOption(Option.builder()
+      .longOpt("noRetryJavafx")
+      .build()
+    );
+
+    options.addOption(Option.builder()
+      .longOpt("checkJvm")
+      .build()
+    );
+
+    return options;
+  }
+
+  public static CommandLine parseCli(String[] args) throws ParseException {
+    Options options = cliOptionsFull();
+    return new DefaultParser()
+      .parse(options, args);
   }
 
   public static void main(String[] args) throws FileNotFoundException {
@@ -84,99 +164,89 @@ public static void main(String[] args) throws FileNotFoundException {
 
       if (args.length > 0) {
         mode = LaunchMode.HEADLESS;
-        for (int i = 0; i < args.length; i++) {
-          String arg = args[i];
-          switch (arg) {
-            case "--nolauncher":
-              mode = LaunchMode.GUI;
-              break;
-            case "--launcher":
-              forceLauncher = true;
-              break;
-            case "--version":
-              System.out.println("Chunky Launcher v" + LAUNCHER_VERSION);
-              return;
-            case "--verbose":
-              settings.verboseLauncher = true;
-              break;
-            case "--console":
-              settings.forceGuiConsole = true;
-              break;
-            case "--update":
-            case "--updateAlpha":
-              ReleaseChannel channel;
-              if (arg.equals("--updateAlpha")) {
-                channel = LauncherSettings.SNAPSHOT_RELEASE_CHANNEL;
-              } else {
-                channel = settings.selectedChannel;
-                if (i < args.length - 1 && settings.releaseChannels.containsKey(args[i + 1])) {
-                  channel = settings.releaseChannels.getOrDefault(args[i + 1], channel);
-                }
-              }
-              System.out.println("Checking for updates on the \"" + channel.name + "\" channel...");
-              UpdateChecker updateThread = new UpdateChecker(settings, channel, new UpdateListener() {
-                @Override
-                public void updateError(String message) {
-                }
-
-                @Override
-                public void updateAvailable(VersionInfo latest) {
-                  try {
-                    headlessCreateSettingsDirectory();
-                  } catch (FileNotFoundException e) {
-                    throw new Error(e);
-                  }
-                  System.out.println("Downloading Chunky " + latest + ":");
-                  ConsoleUpdater.update(latest, settings);
-                }
-
-                @Override
-                public void noUpdateAvailable() {
-                  System.out.println("No updates found.");
-                }
-              });
-              updateThread.start();
-              return;
-            case "--setup":
-              // Configure launcher settings.
-              doSetup(settings);
-              settings.save();
-              return;
-            case "--noRetryJavafx":
-              retryIfMissingJavafx = false;
-              // if this is the only option, with "--javaOptions" "<param>" we want the launcher
-              if (args.length == 3)
-                forceLauncher = true;
-              break;
-            case "--javaOptions":
-              if (i == args.length - 1) {
-                System.err.println("--javaOptions must be followed by the options to can chunky with");
-                System.exit(1);
-              }
-              if (settings.javaOptions.isEmpty())
-                settings.javaOptions = args[i + 1];
-              else if (!settings.javaOptions.contains(args[i + 1]))
-                settings.javaOptions = args[i + 1] + " " + settings.javaOptions;
-              ++i;
-              break;
-            case "--checkJvm":
-              boolean is64Bit = JreUtil.is64BitJvm();
-              if (!is64Bit) {
-                System.err.println("This does not appear to be a 64-bit JVM.");
-              }
-              System.exit(is64Bit ? 0 : -1);
-            case "--dangerouslyDisableLibraryValidation":
-              System.out.println("Library validation is disabled.");
-              LauncherSettings.disableLibraryValidation = true;
-              break;
-            default:
-              if (!headlessOptions.isEmpty()) {
-                headlessOptions += " ";
-              }
-              headlessOptions += arg;
-              break;
+
+        CommandLine cmd = parseCli(args);
+
+        if (cmd.hasOption("help")) {
+          String header = CliUtil.makeHelpHeader("Chunky Launcher", LAUNCHER_VERSION.toString(), "");
+          String footer = "\n" +
+            "Command line options after -- are passed to Chunky.\n" +
+            "For Chunky's command line help, run:\n" +
+            "  java -jar ChunkyLauncher.jar -- --help";
+
+          HelpFormatter help = new HelpFormatter();
+          help.setWidth(CliUtil.CLI_WIDTH);
+          help.printHelp("java -jar ChunkyLauncher.jar", header, cliOptionsPublic(), footer);
+          return;
+        }
+
+        if (cmd.hasOption("launcher")) {
+          forceLauncher = true;
+        }
+
+        if (cmd.hasOption("version")) {
+          System.out.println("Chunky Launcher v" + LAUNCHER_VERSION);
+          return;
+        }
+
+        if (cmd.hasOption("verbose")) {
+          settings.verboseLauncher = true;
+        }
+
+        if (cmd.hasOption("console")) {
+          settings.forceGuiConsole = true;
+        }
+
+        if (cmd.hasOption("update")) {
+          ReleaseChannel channel = settings.selectedChannel;
+
+          String selected = cmd.getOptionValue("update");
+          if (selected != null) {
+            channel = settings.releaseChannels.getOrDefault(selected, channel);
+          }
+
+          headlessUpdateChunky(settings, channel);
+          return;
+        }
+
+        if (cmd.hasOption("setup")) {
+          doSetup(settings);
+          settings.save();
+          return;
+        }
+
+        if (cmd.hasOption("noRetryJavafx")) {
+          retryIfMissingJavafx = false;
+          // If this is the only option, with "--javaOptions" "<param>" we want to launch as if there were no arguments
+          if (args.length == 3) {
+            mode = LaunchMode.GUI;
           }
         }
+
+        if (cmd.hasOption("javaOptions")) {
+          String options = cmd.getOptionValue("javaOptions");
+          if (settings.javaOptions.isEmpty()) {
+            settings.javaOptions = options;
+          } else if (!settings.javaOptions.contains(options)) {
+            settings.javaOptions = options + " " + settings.javaOptions;
+          }
+        }
+
+        if (cmd.hasOption("checkJvm")) {
+          boolean is64Bit = JreUtil.is64BitJvm();
+          if (!is64Bit) {
+            System.err.println("This does not appear to be a 64-bit JVM.");
+          }
+          System.exit(is64Bit ? 0 : -1);
+        }
+
+        if (cmd.hasOption("dangerouslyDisableLibraryValidation")) {
+          System.out.println("Library validation is disabled.");
+          LauncherSettings.disableLibraryValidation = true;
+        }
+
+        headlessOptions = String.join(" ", cmd.getArgList());
+
         if (forceLauncher) {
           mode = LaunchMode.GUI;
         }
@@ -259,6 +329,8 @@ else if (!settings.javaOptions.contains(args[i + 1]))
         JavaFxInstaller.launch(settings, args);
       }
       e.printStackTrace(System.err);
+    } catch (ParseException e) {
+        System.out.println(e.getMessage());
     }
   }
 
@@ -302,18 +374,111 @@ private static void headlessCreateSettingsDirectory() throws FileNotFoundExcepti
     }
   }
 
+  private static void headlessUpdateChunky(LauncherSettings settings, ReleaseChannel channel) {
+    System.out.println("Checking for updates on the \"" + channel.name + "\" channel...");
+    UpdateChecker updateThread = new UpdateChecker(settings, channel, new UpdateListener() {
+      @Override
+      public void updateError(String message) {
+      }
+
+      @Override
+      public void updateAvailable(VersionInfo latest) {
+        try {
+          headlessCreateSettingsDirectory();
+        } catch (FileNotFoundException e) {
+          throw new Error(e);
+        }
+        System.out.println("Downloading Chunky " + latest + ":");
+        ConsoleUpdater.update(latest, settings);
+      }
+
+      @Override
+      public void noUpdateAvailable() {
+        System.out.println("No updates found.");
+      }
+    });
+    updateThread.start();
+    try {
+      updateThread.join();
+    } catch (InterruptedException ignored) {
+    }
+  }
+
   interface ShowLauncher {
     boolean showLauncher();
   }
 
   private static void doSetup(LauncherSettings settings) throws FileNotFoundException {
     headlessCreateSettingsDirectory();
-    System.out.print("Memory limit (MiB): ");
     Scanner in = new Scanner(System.in);
-    settings.memoryLimit = in.nextInt();
-    in.nextLine();
-    System.out.print("Java options: ");
-    settings.javaOptions = in.nextLine();
+
+    System.out.printf("Memory limit (MiB) [%d]: ", settings.memoryLimit);
+    try {
+      String memoryLimit = in.nextLine().trim();
+      settings.memoryLimit = Integer.parseInt(memoryLimit);
+    } catch (NumberFormatException ignored) {
+    }
+
+    System.out.printf("Java options [%s]: ", settings.javaOptions);
+    {
+      String javaOptions = in.nextLine().trim();
+      if (!javaOptions.isEmpty()) {
+        settings.javaOptions = javaOptions;
+      }
+    }
+
+    System.out.printf("Update site [%s]: ", settings.updateSite);
+    {
+      String updateSite = in.nextLine().trim();
+      if (!updateSite.isEmpty()) {
+        settings.updateSite = updateSite;
+      }
+    }
+
+    System.out.print("Reload launcher metadata [Y/n]: ");
+    {
+      String updateReleaseChannels = in.nextLine().trim();
+      if (!updateReleaseChannels.contains("n")) {
+        reloadReleaseChannels(settings);
+      }
+    }
+  }
+
+  private static void reloadReleaseChannels(LauncherSettings settings) {
+    System.out.print("...");
+    LauncherInfoChecker checker = new LauncherInfoChecker(
+      settings,
+      error -> {
+        System.err.println("Failed to fetch launcher info!");
+        System.err.println(error);
+      },
+      info -> {
+        if (info != null) {
+          if (info.version.compareTo(ChunkyLauncher.LAUNCHER_VERSION) > 0) {
+            System.out.println("Launcher update found!");
+            System.out.printf("Version %s released on %s\n", info.version, info.date);
+            System.out.println(settings.getResourceUrl(info.path));
+            if (info.notes.isEmpty()) {
+              System.out.println("No release notes available.");
+            } else {
+              System.out.println(info.notes);
+            }
+            System.out.println();
+          } else {
+            System.out.println("Launcher is up to date!");
+          }
+
+          settings.setReleaseChannels(info.channels);
+          System.out.printf("%d release channels found.\n", info.channels.size());
+        }
+      }
+    );
+    checker.start();
+    try {
+      checker.join();
+    } catch (InterruptedException e) {
+      System.err.println("Interrupted!");
+    }
   }
 
   /**
@@ -391,4 +556,13 @@ public static String prettyPrintSize(int size) {
       return String.format("%.1f %s", fSize, unit);
     }
   }
+
+  /**
+   * Print a launch error message to the console.
+   * Prints the command that was used to try to launch Chunky.
+   */
+  protected static void launchFailure(String command) {
+    System.out.println("Failed to launch Chunky. Command used:");
+    System.out.println(command);
+  }
 }
diff --git a/launcher/test/se/llbit/chunky/launcher/ChunkyLauncherCliParseTest.java b/launcher/test/se/llbit/chunky/launcher/ChunkyLauncherCliParseTest.java
new file mode 100644
index 000000000..a0cde5750
--- /dev/null
+++ b/launcher/test/se/llbit/chunky/launcher/ChunkyLauncherCliParseTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2024 Chunky contributors
+ *
+ * This file is part of Chunky.
+ *
+ * Chunky is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Chunky is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with Chunky.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package se.llbit.chunky.launcher;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+import org.junit.Test;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+public class ChunkyLauncherCliParseTest {
+  @Test
+  public void testAdditionalOptions() throws ParseException {
+    CommandLine cmd = ChunkyLauncher.parseCli(new String[] { "--", "--help", "--help1" });
+    assertThat(cmd.getOptions().length).isEqualTo(0);
+    assertThat(cmd.getArgs().length).isEqualTo(2);
+    assertThat(cmd.getArgs()[0]).isEqualTo("--help");
+    assertThat(cmd.getArgs()[1]).isEqualTo("--help1");
+  }
+
+  @Test
+  public void testOptions() throws ParseException {
+    CommandLine cmd;
+
+    // Check --help
+    cmd = ChunkyLauncher.parseCli(new String[] { "--help" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("help")).isTrue();
+
+    // Check -h
+    cmd = ChunkyLauncher.parseCli(new String[] { "-h" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("help")).isTrue();
+
+    // Check --launcher
+    cmd = ChunkyLauncher.parseCli(new String[] { "--launcher" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("launcher")).isTrue();
+
+    // Check --version
+    cmd = ChunkyLauncher.parseCli(new String[] { "--version" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("version")).isTrue();
+
+    // Check --verbose
+    cmd = ChunkyLauncher.parseCli(new String[] { "--verbose" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("verbose")).isTrue();
+
+    // Check --console
+    cmd = ChunkyLauncher.parseCli(new String[] { "--console" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("console")).isTrue();
+
+    // Check --setup
+    cmd = ChunkyLauncher.parseCli(new String[] { "--setup" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("setup")).isTrue();
+
+    // Check --update
+    cmd = ChunkyLauncher.parseCli(new String[] { "--update" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("update")).isTrue();
+
+    // Check --dangerouslyDisableLibraryValidation
+    cmd = ChunkyLauncher.parseCli(new String[] { "--dangerouslyDisableLibraryValidation" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("dangerouslyDisableLibraryValidation")).isTrue();
+
+    // Check --javaOptions
+    cmd = ChunkyLauncher.parseCli(new String[] { "--javaOptions", "test" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("javaOptions")).isTrue();
+    assertThat(cmd.getOptionValue("javaOptions")).isEqualTo("test");
+
+    // Check --noRetryJavafx
+    cmd = ChunkyLauncher.parseCli(new String[] { "--noRetryJavafx" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("noRetryJavafx")).isTrue();
+
+    // Check --checkJvm
+    cmd = ChunkyLauncher.parseCli(new String[] { "--checkJvm" });
+    assertThat(cmd.getOptions().length).isEqualTo(1);
+    assertThat(cmd.hasOption("checkJvm")).isTrue();
+  }
+}
diff --git a/lib/src/se/llbit/chunky/HelpCopyright.java b/lib/src/se/llbit/chunky/HelpCopyright.java
new file mode 100644
index 000000000..2dd70a6e7
--- /dev/null
+++ b/lib/src/se/llbit/chunky/HelpCopyright.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Chunky contributors
+ *
+ * This file is part of Chunky.
+ *
+ * Chunky is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Chunky is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with Chunky.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package se.llbit.chunky;
+
+/**
+ * This contains the proper copyright information for various messages
+ */
+public class HelpCopyright {
+  public static final String COPYRIGHT_LINE = "Copyright (c) 2010-2024 Jesper Öqvist and Chunky Contributors";
+
+  public static final String COPYRIGHT_DISCLAIMER =
+    "Chunky comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it " +
+    "under certain conditions. See the GNU General Public License v3 for more details.";
+}
diff --git a/lib/src/se/llbit/chunky/cli/CliUtil.java b/lib/src/se/llbit/chunky/cli/CliUtil.java
new file mode 100644
index 000000000..2bd6935d5
--- /dev/null
+++ b/lib/src/se/llbit/chunky/cli/CliUtil.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Chunky contributors
+ *
+ * This file is part of Chunky.
+ *
+ * Chunky is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Chunky is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with Chunky.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package se.llbit.chunky.cli;
+
+import se.llbit.chunky.HelpCopyright;
+
+public class CliUtil {
+  /**
+   * Width of the CLI help
+   */
+  public static final int CLI_WIDTH = 102;
+
+  /**
+   * Make the header for help messages
+   * @param name        Name of the program
+   * @param version     Version of the program
+   * @param description Description after the copyright statement
+   */
+  public static String makeHelpHeader(String name, String version, String description) {
+    return String.format("%s %s, ", name, version) +
+      HelpCopyright.COPYRIGHT_LINE + "\n\n" +
+      HelpCopyright.COPYRIGHT_DISCLAIMER + "\n\n" +
+      description;
+  }
+}