diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index 1386b11d90..ce29789bf0 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From bdae10cc5e0da615921857bb3bc110820e54efde Mon Sep 17 00:00:00 2001
+From dfdb1b174e65bec80045ba19be94bacab4b4139b Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
-Date: Thu, 27 Nov 2014 21:07:38 -0800
+Date: Tue, 2 Dec 2014 00:16:08 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 072f84d..c0616db 100644
+index 072f84d..140afdb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,18 +1,18 @@
@@ -19,7 +19,7 @@ index 072f84d..c0616db 100644
 -    <name>Spigot-API</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>PaperSpigot-API</name>
-+    <url>>https://github.com/PaperSpigot/Paper</url>
++    <url>https://github.com/PaperSpigot/Paper</url>
  
      <properties>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/Spigot-Server-Patches/0001-POM-changes.patch b/Spigot-Server-Patches/0001-POM-changes.patch
index b8d6aadc28..fdca9e36ed 100644
--- a/Spigot-Server-Patches/0001-POM-changes.patch
+++ b/Spigot-Server-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From ef69e326d930564b7c45cd34a9d583e3dcf25744 Mon Sep 17 00:00:00 2001
+From 1ca95f1f1dc4022158def293a6a1f6d0b3f59132 Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
-Date: Thu, 27 Nov 2014 22:43:08 -0800
+Date: Tue, 2 Dec 2014 00:35:01 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 64600fb..fc72aa1 100644
+index 5fd93be..87ffb97 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -47,15 +47,31 @@ index 64600fb..fc72aa1 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -146,7 +146,7 @@
-         <artifactId>gitdescribe-maven-plugin</artifactId>
-         <version>1.3</version>
-         <configuration>
--          <outputPrefix>git-Spigot-</outputPrefix>
-+          <outputPrefix>git-PaperSpigot-</outputPrefix>
-           <outputPostfix></outputPostfix>
-         </configuration>
+@@ -152,12 +152,12 @@
+         </configuration>    
          <executions>
+           <execution>
+-            <id>ex-spigot</id>            
++            <id>ex-paperspigot</id>
+             <configuration>
+-              <outputPrefix>git-Spigot-</outputPrefix>
++              <outputPrefix>git-PaperSpigot-</outputPrefix>
+               <outputPostfix></outputPostfix>
+               <scmDirectory>../</scmDirectory>
+-              <descriptionProperty>spigot.desc</descriptionProperty>
++              <descriptionProperty>paperspigot.desc</descriptionProperty>
+             </configuration>
+             <phase>compile</phase>
+             <goals>
+@@ -188,7 +188,7 @@
+             <manifestEntries>
+               <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
+               <Implementation-Title>CraftBukkit</Implementation-Title>
+-              <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
++              <Implementation-Version>${paperspigot.desc}${craftbukkit.desc}</Implementation-Version>
+               <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
+               <Specification-Title>Bukkit</Specification-Title>
+               <Specification-Version>${api.version}</Specification-Version>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 9304637..3a4b142 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch
index 03460f88d2..ba47066a52 100644
--- a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From f858e434f3cc3db73f8279111267edc4a758c44f Mon Sep 17 00:00:00 2001
+From 447080b025482480d29ced70cbf30bc18b8fbc4b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 28 Nov 2014 03:31:21 -0600
 Subject: [PATCH] Player affects spawning API
@@ -30,10 +30,10 @@ index 91c6b71..40abc51 100644
              if (entityhuman != null) {
                  double d0 = entityhuman.locX - this.locX;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 4ff4ece..ecd518b 100644
+index da3f249..cc4d38c 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-@@ -47,7 +47,8 @@ public abstract class MobSpawnerAbstract {
+@@ -52,7 +52,8 @@ public abstract class MobSpawnerAbstract {
      private boolean g() {
          BlockPosition blockposition = this.b();
  
@@ -146,7 +146,7 @@ index 4af7973..899e4b8 100644
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman = (EntityHuman) this.players.get(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 36aeed0..ab8afd7 100644
+index 76de4a4..393b762 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {