diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch
index 6355ad2394..e32ad2db21 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From 80f0b1f242c4e32979a05cc74f0e482c2fdbc0fa Mon Sep 17 00:00:00 2001
+From e1bfb9a5ac6112089f5a13e5b8db381c4d872bcf Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e5fc22a..ef6d467 100644
+index 8837641..713add6 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -391,4 +391,15 @@ public interface Entity extends Metadatable, CommandSender {
+@@ -407,4 +407,15 @@ public interface Entity extends Metadatable, CommandSender {
  
      Spigot spigot();
      // Spigot End
@@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
 +    public org.bukkit.Location getSourceLoc();
  }
 -- 
-2.8.0
+2.8.3
 
diff --git a/Spigot-Server-Patches/0026-Entity-Origin-API.patch b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
index da5bfa37bf..c9d533e6f6 100644
--- a/Spigot-Server-Patches/0026-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 8c16d42fc8c678523d3198f8ba20fba2580ef0c3 Mon Sep 17 00:00:00 2001
+From 5d1aa3294755247d1d1c79c44aa017396179d98f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -89,7 +89,7 @@ index 564ea37..1113b1c 100644
  
      public EntityLiving getSource() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 81f4a42..9bfabe0 100644
+index 7f239c6..5984ffb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -958,6 +958,12 @@ public abstract class World implements IBlockAccess {
@@ -106,10 +106,10 @@ index 81f4a42..9bfabe0 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b5126d4..a6c0b45 100644
+index 5c7f274..c65585b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -604,4 +604,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -614,4 +614,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
 +    // Paper end
  }
 -- 
-2.8.2
+2.8.3
 
diff --git a/work/Bukkit b/work/Bukkit
index 8070822510..c5bf6bc614 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 8070822510bfb64a20c3d0101b69164482732d7d
+Subproject commit c5bf6bc614bfd1e119e7fc067ff30cd8e8221cb2
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 5ff377a9b2..0cd0397a82 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5ff377a9b2d4fcd1545ad4f80211afbaa48bc578
+Subproject commit 0cd0397a8295992112ad3bf0d37795a04d22503e
diff --git a/work/Spigot b/work/Spigot
index 8a048fe4a4..798f32dcaa 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 8a048fe4a4351b6a293cea7409a42332a31f17f5
+Subproject commit 798f32dcaacf2cb2af0d4e17ff0d221dafe141ab