diff --git a/pom.xml b/pom.xml
index 31120a791..c237d2a55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,19 +11,24 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.1-R3</craftbukkit.version>
+		<bukkit.version>1.1-R4</bukkit.version>
+		<craftbukkit.version>1.1-R4</craftbukkit.version>
 		<build.number>Unknown</build.number>
 	</properties>
 
 	<repositories>
+		<repository>
+			<id>craftbukkit-repo</id>
+			<url>http://repo.bukkit.org/org/bukkit/craftbukkit/${craftbukkit.version}/craftbukkit-${craftbukkit.version}.jar</url>
+		</repository>
 		<repository>
 			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/groups/repo/</url>
+			<url>http://repo.bukkit.org/org/bukkit/bukkit/${bukkit.version}/bukkit-${bukkit.version}.jar</url>
 		</repository>
 		<repository>
 			<id>citizensapi-repo</id>
 			<!-- This does not work yet. Need repo to be set up. -->
-			<url>http://repo.citizensnpcs.net/content/groups/repo/</url>
+			<url>http://repo.citizensnpcs.net</url>
 		</repository>
 	</repositories>
 
@@ -45,22 +50,27 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.1-R5-SNAPSHOT</version>
+			<version>${bukkit.version}</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<artifactId>junit-dep</artifactId>
 			<version>4.10</version>
 			<type>jar</type>
 			<scope>test</scope>
+			<exclusions>
+                <exclusion>
+                    <artifactId>hamcrest-core</artifactId>
+                    <groupId>org.hamcrest</groupId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>1.3.RC2</version>
-			<type>jar</type>
+			<version>1.2.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>