diff --git a/Spigot-Server-Patches/Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/Configurable-lava-flow-speed.patch
new file mode 100644
index 0000000000..579ba0be06
--- /dev/null
+++ b/Spigot-Server-Patches/Configurable-lava-flow-speed.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Byteflux <byte@byteflux.net>
+Date: Wed, 1 Jul 2015 00:38:10 -0700
+Subject: [PATCH] Configurable lava flow speed
+
+
+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 {
+      * PaperSpigot - Get flow speed. Throttle if its water and flowing adjacent to lava
+      */
+     public int getFlowSpeed(World world, BlockPosition blockposition) {
++        if (this.getMaterial() == Material.LAVA) {
++            return world.worldProvider.o() ? world.paperSpigotConfig.lavaFlowSpeedNether : world.paperSpigotConfig.lavaFlowSpeedNormal;
++        }
+         if (this.getMaterial() == Material.WATER && (
+                 world.getType(blockposition.north(1)).getBlock().getMaterial() == Material.LAVA ||
+                         world.getType(blockposition.south(1)).getBlock().getMaterial() == Material.LAVA ||
+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
+         fastDrainLava = getBoolean( "fast-drain.lava", false );
+         fastDrainWater = getBoolean( "fast-drain.water", false );
+     }
++
++    public int lavaFlowSpeedNormal;
++    public int lavaFlowSpeedNether;
++    private void lavaFlowSpeed()
++    {
++        lavaFlowSpeedNormal = getInt( "lava-flow-speed.normal", 30 );
++        lavaFlowSpeedNether = getInt( "lava-flow-speed.nether", 10 );
++    }
+ }
+-- 
+1.9.5.msysgit.1
+