diff --git a/Spigot-API-Patches/0014-Require-Java-8.patch b/Spigot-API-Patches/0014-Require-Java-8.patch
new file mode 100644
index 0000000000..fea9b5acd0
--- /dev/null
+++ b/Spigot-API-Patches/0014-Require-Java-8.patch
@@ -0,0 +1,52 @@
+From 9bdea46a67a9a7779a451416f32af354373289dc Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Fri, 8 Jan 2016 23:50:25 -0600
+Subject: [PATCH] Require Java 8
+
+
+diff --git a/pom.xml b/pom.xml
+index 3ccfabb..7dd0adb 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -19,8 +19,9 @@
+     <description>An enhanced plugin API for Minecraft servers.</description>
+ 
+     <properties>
+-        <maven.compiler.source>1.6</maven.compiler.source>
+-        <maven.compiler.target>1.6</maven.compiler.target>
++        <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
++        <maven.compiler.source>1.8</maven.compiler.source>
++        <maven.compiler.target>1.8</maven.compiler.target>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+     </properties>
+ 
+@@ -136,26 +137,6 @@
+                 </dependencies>
+             </plugin>
+             <plugin>
+-                <groupId>org.codehaus.mojo</groupId>
+-                <artifactId>animal-sniffer-maven-plugin</artifactId>
+-                <version>1.13</version>
+-                <executions>
+-                    <execution>
+-                        <phase>process-classes</phase>
+-                        <goals>
+-                            <goal>check</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-                <configuration>
+-                    <signature>
+-                        <groupId>org.codehaus.mojo.signature</groupId>
+-                        <artifactId>java16</artifactId>
+-                        <version>1.1</version>
+-                    </signature>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+                 <version>2.3</version>
+-- 
+2.7.0
+
diff --git a/Spigot-Server-Patches/0080-Require-Java-8.patch b/Spigot-Server-Patches/0080-Require-Java-8.patch
new file mode 100644
index 0000000000..8df4724096
--- /dev/null
+++ b/Spigot-Server-Patches/0080-Require-Java-8.patch
@@ -0,0 +1,65 @@
+From f7b5a4f597e231c459d6de50e1ef14a1f3e664a6 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Fri, 8 Jan 2016 23:50:25 -0600
+Subject: [PATCH] Require Java 8
+
+
+diff --git a/pom.xml b/pom.xml
+index 4ec5bf6..b4ead1d 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -16,8 +16,9 @@
+         <minecraft_version>1_8_R3</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>
++        <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
++        <maven.compiler.source>1.8</maven.compiler.source>
++        <maven.compiler.target>1.8</maven.compiler.target>
+     </properties>
+ 
+     <parent>
+@@ -173,26 +174,6 @@
+                 </configuration>
+             </plugin>
+             <plugin>
+-                <groupId>org.codehaus.mojo</groupId>
+-                <artifactId>animal-sniffer-maven-plugin</artifactId>
+-                <version>1.13</version>
+-                <executions>
+-                    <execution>
+-                        <phase>process-classes</phase>
+-                        <goals>
+-                            <goal>check</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-                <configuration>
+-                    <signature>
+-                        <groupId>org.codehaus.mojo.signature</groupId>
+-                        <artifactId>java16</artifactId>
+-                        <version>1.1</version>
+-                    </signature>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+                 <version>2.3</version>
+diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
+index c110e0c..5540dde 100644
+--- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
++++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
+@@ -11,7 +11,7 @@ public class PathfinderGoalNearestAttackableTarget<T extends EntityLiving> exten
+     protected final Class<T> a;
+     private final int g;
+     protected final PathfinderGoalNearestAttackableTarget.DistanceComparator b;
+-    protected Predicate<? super T> c;
++    protected Predicate c;
+     protected EntityLiving d;
+ 
+     public PathfinderGoalNearestAttackableTarget(EntityCreature entitycreature, Class<T> oclass, boolean flag) {
+-- 
+2.7.0
+