diff --git a/pom.xml b/pom.xml
index 5c0c6c941e..a0d4db6275 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,8 @@
     <minecraft_version>1_8_R1</minecraft_version>
     <buildtag.prefix>git-Bukkit-</buildtag.prefix>
     <buildtag.suffix></buildtag.suffix>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -81,6 +83,14 @@
     </dependency>
   </dependencies>
 
+  <!-- required until fixed plexus-compiler-eclipse is deployed -->
+  <pluginRepositories>
+      <pluginRepository>
+          <id>spigotmc-public</id>
+          <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+      </pluginRepository>
+  </pluginRepositories>
+
   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
   <build>
     <defaultGoal>clean install</defaultGoal>
@@ -229,13 +239,24 @@
           </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <!-- versions after this appear to be broken -->
+          <version>3.1</version>
+          <configuration>
+              <!-- we use the Eclipse compiler as it doesn't need a JDK -->
+              <compilerId>eclipse</compilerId>
+              <!-- source and target are ignored if this isn't true -->
+              <optimize>true</optimize>
+          </configuration>
+          <dependencies>
+              <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
+              <dependency>
+                  <groupId>org.codehaus.plexus</groupId>
+                  <artifactId>plexus-compiler-eclipse</artifactId>
+                  <version>2.5.0-spigotmc</version>
+              </dependency>
+          </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>