diff --git a/Essentials/pom.xml b/Essentials/pom.xml
index ee516d72a..81a7397d0 100644
--- a/Essentials/pom.xml
+++ b/Essentials/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>
 		<dependency>
 			<groupId>BOSEconomy</groupId>
 			<artifactId>BOSEconomy</artifactId>
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index c06f6888e..52e3b2ce3 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -474,49 +474,41 @@ public class OfflinePlayer implements Player
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void removeAchievement(Achievement achievement)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public boolean hasAchievement(Achievement achievement)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic ststc)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic ststc, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void setStatistic(Statistic statistic, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public int getStatistic(Statistic statistic) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
@@ -528,67 +520,56 @@ public class OfflinePlayer implements Player
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void setStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic statistic, EntityType entityType, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, EntityType entityType, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void setStatistic(Statistic statistic, EntityType entityType, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml
index 224ac1afd..a23c6aa64 100644
--- a/EssentialsAntiBuild/pom.xml
+++ b/EssentialsAntiBuild/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsChat/pom.xml b/EssentialsChat/pom.xml
index b84845c25..247f65407 100644
--- a/EssentialsChat/pom.xml
+++ b/EssentialsChat/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml
index 584b79e58..6652ac150 100644
--- a/EssentialsGeoIP/pom.xml
+++ b/EssentialsGeoIP/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml
index 6434509fb..e2837a728 100644
--- a/EssentialsProtect/pom.xml
+++ b/EssentialsProtect/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsSpawn/pom.xml b/EssentialsSpawn/pom.xml
index a482fe4f0..d6a3b54c9 100644
--- a/EssentialsSpawn/pom.xml
+++ b/EssentialsSpawn/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml
index 36d47d7a2..45035acda 100644
--- a/EssentialsXMPP/pom.xml
+++ b/EssentialsXMPP/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/lib/bukkit.jar b/lib/bukkit.jar
index c041a11cc..eba8f9ac1 100644
Binary files a/lib/bukkit.jar and b/lib/bukkit.jar differ
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
index 43a67c050..b0ef4cd3e 100644
Binary files a/lib/craftbukkit.jar and b/lib/craftbukkit.jar differ
diff --git a/pom.xml b/pom.xml
index a6764ecb1..dc6425375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,6 @@
 			<id>ess-repo</id>
 			<url>http://repo.ess3.net/content/groups/public</url>
 		</repository>
-		<repository>
-			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/groups/public</url>
-		</repository>
 	</repositories>
 
 	<distributionManagement>
@@ -72,11 +68,6 @@
 	</modules>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>bukkit</artifactId>
-			<version>1.7.2-R0.3-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>