diff --git a/CraftBukkit-Patches/0040-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0040-Faster-UUID-for-entities.patch
new file mode 100644
index 0000000000..6a08050ef0
--- /dev/null
+++ b/CraftBukkit-Patches/0040-Faster-UUID-for-entities.patch
@@ -0,0 +1,26 @@
+From 2ea34c31203154d8b790aabaf4064a09824f2c6c Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sun, 17 Mar 2013 19:02:50 +1100
+Subject: [PATCH] Faster UUID for entities
+
+It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
+---
+ src/main/java/net/minecraft/server/Entity.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index 9e5ce4b..83e792c 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -154,7 +154,7 @@ public abstract class Entity {
+         this.ai = false;
+         this.as = 0;
+         this.invulnerable = false;
+-        this.uniqueID = UUID.randomUUID();
++        this.uniqueID = new UUID(random.nextLong(), random.nextLong()); // Spigot
+         this.at = EnumEntitySize.SIZE_2;
+         this.world = world;
+         this.setPosition(0.0D, 0.0D, 0.0D);
+-- 
+1.8.1-rc2
+