diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index 8b9a020d21..5b031d1cf7 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Thu, 27 Nov 2014 21:07:38 -0800
+Date: Tue, 2 Dec 2014 00:16:08 -0600
 Subject: [PATCH] POM changes
 
 
@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <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/POM-changes.patch b/Spigot-Server-Patches/POM-changes.patch
index 223640336f..dd5fdeed1f 100644
--- a/Spigot-Server-Patches/POM-changes.patch
+++ b/Spigot-Server-Patches/POM-changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Thu, 27 Nov 2014 22:43:08 -0800
+Date: Tue, 2 Dec 2014 00:35:01 -0600
 Subject: [PATCH] POM changes
 
 
@@ -48,14 +48,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
        <type>jar</type>
        <scope>compile</scope>
 @@ -0,0 +0,0 @@
-         <artifactId>gitdescribe-maven-plugin</artifactId>
-         <version>1.3</version>
-         <configuration>
--          <outputPrefix>git-Spigot-</outputPrefix>
-+          <outputPrefix>git-PaperSpigot-</outputPrefix>
-           <outputPostfix></outputPostfix>
-         </configuration>
+         </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>
+@@ -0,0 +0,0 @@
+             <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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java