diff --git a/Spigot-Server-Patches/EntityTransformedEvent.patch b/Spigot-Server-Patches/EntityTransformedEvent.patch
index 69cb0044f1..ec53762f19 100644
--- a/Spigot-Server-Patches/EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/EntityTransformedEvent.patch
@@ -49,7 +49,7 @@ index 7a943a6c2..7998b80c1 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index c6198626a..86e5fbcda 100644
+index 670e38eb8..359ac8b88 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -0,0 +0,0 @@ public class EntityZombieVillager extends EntityZombie {
diff --git a/Spigot-Server-Patches/Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/Use-EntityTypes-for-living-entities.patch
index 6bfc2730dd..dee6cac407 100644
--- a/Spigot-Server-Patches/Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/Use-EntityTypes-for-living-entities.patch
@@ -433,7 +433,7 @@ index 85d402965..0cca7b6d5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 86e5fbcda..fb96743af 100644
+index 359ac8b88..96a1b1d3f 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -0,0 +0,0 @@ public class EntityZombieVillager extends EntityZombie {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f40143ef5e..812f66aa99 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f40143ef5e2215b15c08eac481517bd6a0cf7239
+Subproject commit 812f66aa99d7ef65f29ea60690dccbcc4ccec369