diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index d76dfd47ca..5ff96922ad 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 98f2d67a..9934e9af 100644
+index 98f2d67a..49fe56cc 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -105,6 +105,15 @@ index 98f2d67a..9934e9af 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <version>3.7.0</version>
+-                <configuration>
+-                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
+-                    <compilerId>eclipse</compilerId>
+-                </configuration>
+                 <dependencies>
+                     <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
+                     <dependency>
 @@ -0,0 +0,0 @@
                      </dependency>
                  </dependencies>
diff --git a/Spigot-API-Patches/Remove-eclipse-compiler-we-require-a-JDK-anyways.patch b/Spigot-API-Patches/Remove-eclipse-compiler-we-require-a-JDK-anyways.patch
deleted file mode 100644
index d5a794e207..0000000000
--- a/Spigot-API-Patches/Remove-eclipse-compiler-we-require-a-JDK-anyways.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Fri, 22 Sep 2017 20:11:42 -0500
-Subject: [PATCH] Remove eclipse compiler, we require a JDK anyways Fixes
- building with JDK 9
-
-
-diff --git a/pom.xml b/pom.xml
-index a775f4ed..3ce500f8 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -0,0 +0,0 @@
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.7.0</version>
--                <configuration>
--                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
--                    <compilerId>eclipse</compilerId>
--                </configuration>
--                <dependencies>
--                    <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
--                    <dependency>
--                        <groupId>org.codehaus.plexus</groupId>
--                        <artifactId>plexus-compiler-eclipse</artifactId>
--                        <version>2.8.2-spigotmc</version>
--                    </dependency>
--                </dependencies>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
---
\ No newline at end of file
diff --git a/scripts/paperclip.sh b/scripts/paperclip.sh
index 92e0b96180..579b3db680 100755
--- a/scripts/paperclip.sh
+++ b/scripts/paperclip.sh
@@ -12,7 +12,7 @@ vanillajar="../Minecraft/$mcver/$mcver.jar"
     cd "$workdir/Paperclip"
     mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar"
 )
-cp "$workdir/Paperclip/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar"
+cp "$workdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar"
 
 echo ""
 echo ""
diff --git a/work/Paperclip b/work/Paperclip
index 6dcb3241ca..4abd39dd10 160000
--- a/work/Paperclip
+++ b/work/Paperclip
@@ -1 +1 @@
-Subproject commit 6dcb3241ca8e69fb8209e54fea507425c508915e
+Subproject commit 4abd39dd10f1664d919bba774cce840ae8f8d8dd