diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index 50c8d8ca11..9f9d9bc9c2 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: Sat, 7 Mar 2015 19:16:09 -0600
+Date: Thu, 19 Mar 2015 19:41:15 -0500
 Subject: [PATCH] POM Changes
 
 
@@ -10,68 +10,76 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
--  <groupId>org.spigotmc</groupId>
--  <artifactId>spigot</artifactId>
-+  <groupId>org.github.paperspigot</groupId>
-+  <artifactId>paperspigot</artifactId>
-   <packaging>jar</packaging>
-   <version>1.8.3-R0.1-SNAPSHOT</version>
--  <name>Spigot</name>
--  <url>http://www.spigotmc.org</url>
-+  <name>PaperSpigot</name>
-+  <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
- 
-   <properties>
-     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -0,0 +0,0 @@
-   </properties>
- 
-   <parent>
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+     <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.spigotmc</groupId>
--    <artifactId>spigot-parent</artifactId>
+-    <artifactId>spigot</artifactId>
 +    <groupId>org.github.paperspigot</groupId>
-+    <artifactId>paperspigot-parent</artifactId>
-     <version>dev-SNAPSHOT</version>
-     <relativePath>../pom.xml</relativePath>
-   </parent>
++    <artifactId>paperspigot</artifactId>
+     <packaging>jar</packaging>
+     <version>1.8.3-R0.1-SNAPSHOT</version>
+-    <name>Spigot</name>
+-    <url>http://www.spigotmc.org</url>
++    <name>>PaperSpigot</name>
++    <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
+ 
+     <properties>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 @@ -0,0 +0,0 @@
-         <version>3.0.3</version>
-     </dependency>    
-     <dependency>
--      <groupId>org.spigotmc</groupId>
--      <artifactId>spigot-api</artifactId>
-+      <groupId>org.github.paperspigot</groupId>
-+      <artifactId>paperspigot-api</artifactId>
-       <version>${project.version}</version>
-       <type>jar</type>
-       <scope>compile</scope>
+     </properties>
+ 
+     <parent>
+-        <groupId>org.spigotmc</groupId>
+-        <artifactId>spigot-parent</artifactId>
++        <groupId>org.github.paperspigot</groupId>
++        <artifactId>paperspigot-parent</artifactId>
+         <version>dev-SNAPSHOT</version>
+         <relativePath>../pom.xml</relativePath>
+     </parent>
 @@ -0,0 +0,0 @@
-         </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>
+             <version>3.0.3</version>
+         </dependency>
+         <dependency>
+-            <groupId>org.spigotmc</groupId>
+-            <artifactId>spigot-api</artifactId>
++            <groupId>org.github.paperspigot</groupId>
++            <artifactId>paperspigot-api</artifactId>
+             <version>${project.version}</version>
+             <type>jar</type>
+             <scope>compile</scope>
 @@ -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>
+                 <version>0.2</version>
+                 <executions>
+                     <execution>
+-                        <id>ex-spigot</id>
++                        <id>ex-paperspigot</id>
+                         <configuration>
+-                            <format>git-Spigot-%s</format>
++                            <format>git-PaperSpigot-%s</format>
+                             <scmDirectory>../</scmDirectory>
+-                            <descriptionProperty>spigot.desc</descriptionProperty>
++                            <descriptionProperty>paperspigot.desc</descriptionProperty>
+                         </configuration>
+                         <phase>initialize</phase>
+                         <goals>
+@@ -0,0 +0,0 @@
+                         </goals>
+                     </execution>
+                 </executions>
+-            </plugin>  
++            </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-jar-plugin</artifactId>
+@@ -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