diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index 8eb2e17ae6..cd90f232c9 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -1,14 +1,14 @@
-From e0f7016338cf6506d7415d8373c425e0de92252c Mon Sep 17 00:00:00 2001
+From 6657d4637da53ca67b7cf5fac814381313b7e869 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:44:24 +1100
 Subject: [PATCH] POM Changes.
 
 ---
- pom.xml | 55 +++++++++++++++++++++----------------------------------
- 1 file changed, 21 insertions(+), 34 deletions(-)
+ pom.xml | 69 ++++++++++++++++++++++++++++++-----------------------------------
+ 1 file changed, 32 insertions(+), 37 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index d697ca1..f17bd19 100644
+index d697ca1..a92e73d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -82,7 +82,7 @@ index d697ca1..f17bd19 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -145,6 +127,11 @@
+@@ -145,18 +127,31 @@
        <version>1.3</version>
        <scope>test</scope>
      </dependency>
@@ -94,7 +94,22 @@ index d697ca1..f17bd19 100644
    </dependencies>
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
-@@ -156,7 +143,7 @@
+   <build>
+-    <defaultGoal>clean install</defaultGoal>
+-    <plugins>
+-      <plugin>
++      <defaultGoal>install</defaultGoal>
++      <plugins>
++          <plugin>
++              <!-- Don't deploy server to maven repo, only API -->
++              <groupId>org.apache.maven.plugins</groupId>
++              <artifactId>maven-deploy-plugin</artifactId>
++              <configuration>
++                  <skip>true</skip>
++              </configuration>
++          </plugin>
++        <plugin>
+         <groupId>com.lukegb.mojo</groupId>
          <artifactId>gitdescribe-maven-plugin</artifactId>
          <version>1.3</version>
          <configuration>
@@ -103,7 +118,7 @@ index d697ca1..f17bd19 100644
            <outputPostfix></outputPostfix>
          </configuration>
          <executions>
-@@ -210,7 +197,7 @@
+@@ -210,7 +205,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-shade-plugin</artifactId>
diff --git a/applyPatches.sh b/applyPatches.sh
index 838d16a80c..70c860b4b9 100755
--- a/applyPatches.sh
+++ b/applyPatches.sh
@@ -32,4 +32,4 @@ function applyPatch {
     fi
 }
 
-applyPatch Bukkit Spigot-API && applyPatch CraftBukkit Spigot
+applyPatch Bukkit Spigot-API && applyPatch CraftBukkit Spigot-Server
diff --git a/pom.xml b/pom.xml
index aa9dd7cfea..23fd156bc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <url>https://github.com/EcoCityCraft/Spigot</url>
 
     <modules>
-        <module>Spigot</module>
+        <module>Spigot-Server</module>
         <module>Spigot-API</module>
     </modules>
 
diff --git a/rebuildPatches.sh b/rebuildPatches.sh
index 4f0a843af0..85e22fe2be 100755
--- a/rebuildPatches.sh
+++ b/rebuildPatches.sh
@@ -32,4 +32,4 @@ function savePatches {
 }
 
 savePatches Bukkit Spigot-API
-savePatches CraftBukkit Spigot
+savePatches CraftBukkit Spigot-Server