diff --git a/CLI-253-workaround.patch b/CLI-253-workaround.patch
index 1876bcf..6cd252f 100644
--- a/CLI-253-workaround.patch
+++ b/CLI-253-workaround.patch
@@ -6,10 +6,8 @@ CommitDate: Mon Jun 22 15:04:05 2015 +0200
 
     [CLI-253] Prevent "Unrecognized option: --null" when handling long opts in PosixParser
 
-Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java
-===================================================================
---- commons-cli-1.7.0-src.orig/src/main/java/org/apache/commons/cli/Options.java
-+++ commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java
+--- a/src/main/java/org/apache/commons/cli/Options.java
++++ b/src/main/java/org/apache/commons/cli/Options.java
 @@ -195,6 +195,20 @@ public class Options implements Serializ
          return this;
      }
@@ -31,23 +29,19 @@ Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java
      /**
       * Gets the options with a long name starting with the name specified.
       *
-Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/PosixParser.java
-===================================================================
---- commons-cli-1.7.0-src.orig/src/main/java/org/apache/commons/cli/PosixParser.java
-+++ commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/PosixParser.java
-@@ -145,7 +145,7 @@ public class PosixParser extends Parser
-                 } else if (matchingOpts.size() > 1) {
-                     throw new AmbiguousOptionException(opt, matchingOpts);
-                 } else {
--                    currentOption = options.getOption(matchingOpts.get(0));
-+                    currentOption = options.getLongOption(matchingOpts.get(0));
+--- a/src/main/java/org/apache/commons/cli/PosixParser.java
++++ b/src/main/java/org/apache/commons/cli/PosixParser.java
+@@ -141,7 +141,7 @@ public class PosixParser extends Parser
+                     } else if (matchingOpts.size() > 1) {
+                         throw new AmbiguousOptionException(opt, matchingOpts);
+                     } else {
+-                        currentOption = options.getOption(matchingOpts.get(0));
++                        currentOption = options.getLongOption(matchingOpts.get(0));
  
-                     tokens.add("--" + currentOption.getLongOpt());
-                     if (pos != -1) {
-Index: commons-cli-1.7.0-src/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java
-===================================================================
+                         tokens.add("--" + currentOption.getLongOpt());
+                         if (pos != -1) {
 --- /dev/null
-+++ commons-cli-1.7.0-src/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java
++++ b/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java
 @@ -0,0 +1,44 @@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/apache-commons-cli-build.xml b/apache-commons-cli-build.xml
index af4ba64..d04800a 100644
--- a/apache-commons-cli-build.xml
+++ b/apache-commons-cli-build.xml
@@ -8,7 +8,7 @@
 
   <property name="project.artifactId" value="commons-cli"/>
   <property name="project.groupId" value="commons-cli"/>
-  <property name="project.version" value="1.7.0"/>
+  <property name="project.version" value="1.8.0"/>
 
   <property name="compiler.release" value="8"/>
   <property name="compiler.source" value="1.${compiler.release}"/>
diff --git a/apache-commons-cli.changes b/apache-commons-cli.changes
index 661120c..3d9c93c 100644
--- a/apache-commons-cli.changes
+++ b/apache-commons-cli.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 12 12:14:19 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
+
+- Update to 1.8.0
+  * Fix Javadoc pathing #280. Fixes CLI-334.
+- Revised CLI-253-workaround.patch for compatibility with 1.8.0
+
 -------------------------------------------------------------------
 Mon Apr 29 11:36:14 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index efa38cf..f6c4b18 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -19,7 +19,7 @@
 %global base_name       cli
 %global short_name      commons-%{base_name}
 Name:           apache-commons-cli
-Version:        1.7.0
+Version:        1.8.0
 Release:        0
 Summary:        Command Line Interface Library for Java
 License:        Apache-2.0
diff --git a/commons-cli-1.7.0-src.tar.gz b/commons-cli-1.7.0-src.tar.gz
deleted file mode 100644
index f19f76b..0000000
--- a/commons-cli-1.7.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34ff1d3f5a41c2d71734468e350b3d30642e75c504cdcd8a97ca7caaa4730cdf
-size 177969
diff --git a/commons-cli-1.8.0-src.tar.gz b/commons-cli-1.8.0-src.tar.gz
new file mode 100644
index 0000000..005d80f
--- /dev/null
+++ b/commons-cli-1.8.0-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ff484c5b318df2d451c0f746a44f4839cedc953f4d4143c04176a3436e0a1ba
+size 180524