diff --git a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
index cefb14da8..39b2ed8bf 100644
--- a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From cb2a71023bfe9b8c9de796ca43cce768d2b4aa6a Mon Sep 17 00:00:00 2001
+From 85d97e725560acd28f08c4398f9bd16ccc66ec7a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:27:13 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index c94163678..caaa3e5b1 100644
--- a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From f1d0beef43c007994fc2f16ad9e5d7ab9d85d02b Mon Sep 17 00:00:00 2001
+From 330ce044c0951d3829ed61953f64dc97072b8bb3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
diff --git a/Spigot-Server-Patches/0261-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0261-Make-max-squid-spawn-height-configurable.patch
new file mode 100644
index 000000000..d4ebbd8d9
--- /dev/null
+++ b/Spigot-Server-Patches/0261-Make-max-squid-spawn-height-configurable.patch
@@ -0,0 +1,40 @@
+From 9012640b501046e64eb77f1f28fd1b246832465d Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Thu, 11 Jan 2018 16:47:28 -0600
+Subject: [PATCH] Make max squid spawn height configurable
+
+I don't know why upstream made only the minimum height configurable but
+whatever
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 964bf2d2..f3e2aee1 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -471,4 +471,9 @@ public class PaperWorldConfig {
+         }
+     }
+ 
++    public double squidMaxSpawnHeight;
++    private void squidMaxSpawnHeight() {
++        squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
++    }
++
+ }
+diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
+index 0ce16be6..58a90283 100644
+--- a/src/main/java/net/minecraft/server/EntitySquid.java
++++ b/src/main/java/net/minecraft/server/EntitySquid.java
+@@ -141,7 +141,9 @@ public class EntitySquid extends EntityWaterAnimal {
+     }
+ 
+     public boolean P() {
+-        return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < (double) this.world.getSeaLevel() && super.P(); // Spigot
++        // Paper - Make max spawn height configurable
++        final double maxHeight = world.paperConfig.squidMaxSpawnHeight > 0 ? world.paperConfig.squidMaxSpawnHeight : world.getSeaLevel();
++        return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < maxHeight && super.P(); // Spigot
+     }
+ 
+     public void b(float f, float f1, float f2) {
+-- 
+2.14.3
+