diff --git a/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch
new file mode 100644
index 0000000000..5e75d60206
--- /dev/null
+++ b/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Byteflux <byte@byteflux.net>
+Date: Sun, 3 Aug 2014 21:20:42 -0500
+Subject: [PATCH] Configurable speed for water flowing over lava
+
+Basic info: http://hastebin.com/axuzaralas.vhdl
+
+diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/BlockFlowing.java
++++ b/src/main/java/net/minecraft/server/BlockFlowing.java
+@@ -0,0 +0,0 @@ public class BlockFlowing extends BlockFluids {
+         }
+ 
+         boolean flag = true;
+-        int i1 = this.a(world);
++        int i1 = this.getFlowSpeed(world, i, j, k); // PaperSpigot
+         int j1;
+ 
+         if (l > 0) {
+@@ -0,0 +0,0 @@ public class BlockFlowing extends BlockFluids {
+     public void onPlace(World world, int i, int j, int k) {
+         super.onPlace(world, i, j, k);
+         if (world.getType(i, j, k) == this) {
+-            world.a(i, j, k, this, this.a(world));
++            world.a(i, j, k, this, this.getFlowSpeed(world, i, j, k)); // PaperSpigot
+         }
+     }
+ 
+     public boolean L() {
+         return true;
+     }
++
++    /**
++     * PaperSpigot - Get flow speed. Throttle if its water and flowing adjacent to lava
++     */
++    public int getFlowSpeed(World world, int x, int y, int z) {
++        if (this.getMaterial() == Material.WATER && (
++                world.getType(x, y, z - 1).getMaterial() == Material.LAVA ||
++                world.getType(x, y, z + 1).getMaterial() == Material.LAVA ||
++                world.getType(x - 1, y, z).getMaterial() == Material.LAVA ||
++                world.getType(x + 1, y, z).getMaterial() == Material.LAVA)) {
++            return world.paperSpigotConfig.waterOverLavaFlowSpeed;
++        }
++        return super.a(world);
++    }
+ }
+diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
+         // Technically a little disingenuous as it applies to all falling blocks but alas, backwards compat prevails!
+         fallingBlockHeightNerf = getDouble( "tnt-entity-height-nerf", 0 );
+     }
++
++    public int waterOverLavaFlowSpeed;
++    private void waterOverLavaFlowSpeed()
++    {
++        waterOverLavaFlowSpeed = getInt( "water-over-lava-flow-speed", 5 );
++        log( "Water over lava flow speed: " + waterOverLavaFlowSpeed);
++    }
+ }
+--
\ No newline at end of file