diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index 22e14cdf3f..958ec60b35 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -81,7 +81,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <descriptionProperty>spigot.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
--                        <goals>
++                        <phase>compile</phase>
+                         <goals>
 -                            <goal>describe</goal>
 -                        </goals>
 -                    </execution>
@@ -93,8 +94,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
-+                        <phase>compile</phase>
-                         <goals>
+-                        <goals>
 -                            <goal>describe</goal>
 +                            <goal>gitdescribe</goal>
                          </goals>
@@ -147,8 +147,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          <configuration>
 +                            <createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper -->
                              <relocations>
+-                                <relocation>
+-                                    <pattern>joptsimple</pattern>
+-                                    <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
+-                                </relocation>
++                                <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 -->
++                                <!--<relocation>-->
++                                    <!--<pattern>joptsimple</pattern>-->
++                                    <!--<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>-->
++                                <!--</relocation>-->
                                  <relocation>
-                                     <pattern>joptsimple</pattern>
+                                     <pattern>jline</pattern>
+                                     <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
 @@ -0,0 +0,0 @@
                  <artifactId>maven-compiler-plugin</artifactId>
                  <!-- versions after this appear to be broken -->