diff --git a/Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch
index 8679509e4d..f27a178b43 100644
--- a/Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch
@@ -82,7 +82,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          OptionParser parser = new OptionParser();
 @@ -0,0 +0,0 @@ public class Commodore
  
-         cr.accept( new ClassVisitor( Opcodes.ASM8, cw )
+         cr.accept( new ClassVisitor( Opcodes.ASM9, cw )
          {
 +            // Paper start - Rewrite plugins
 +            @Override
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 221aed6cf5..c85efa8767 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 221aed6cf5b07b1454cf60231f40a7831ce519e9
+Subproject commit c85efa8767daf863ba854dc451571c46ced9302f