diff --git a/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch b/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch
index 16d3693fb7..a6c7108cdb 100644
--- a/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch
+++ b/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch
@@ -345,4 +345,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        log( "Fix TNT cannons: " + fixCannons );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch b/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch
index dd408c695f..35af935638 100644
--- a/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch
+++ b/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch
@@ -78,8 +78,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- 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
-     {
-         optimizeDraining = getBoolean( "optimize-draining", false );
+         useAsyncLighting = getBoolean( "use-async-lighting", false );
+         log( "World async lighting: " + useAsyncLighting );
      }
 +
 +    public boolean disableEndCredits;
@@ -88,4 +88,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch b/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch
index 7964a3ebb8..7875bf925a 100644
--- a/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch
+++ b/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch
@@ -41,4 +41,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
index b6a0848217..4af83a3f1d 100644
--- a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
+++ b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
@@ -168,4 +168,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              SpigotTimings.checkIfActiveTimer.stopTiming();
              return true;
          }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Generator-Settings.patch b/Spigot-Server-Patches/Generator-Settings.patch
index 838913f108..866d13dfe3 100644
--- a/Spigot-Server-Patches/Generator-Settings.patch
+++ b/Spigot-Server-Patches/Generator-Settings.patch
@@ -275,4 +275,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/Stop-updating-flowing-block-if-material-has-changed.patch
new file mode 100644
index 0000000000..8047cb64d5
--- /dev/null
+++ b/Spigot-Server-Patches/Stop-updating-flowing-block-if-material-has-changed.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Iceee <andrew@opticgaming.tv>
+Date: Tue, 30 Jun 2015 19:31:02 -0700
+Subject: [PATCH] Stop updating flowing block if material has changed
+
+
+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 {
+             this.f(world, blockposition, iblockdata);
+         }
+ 
++        if (world.getType(blockposition).getBlock().getMaterial() != material) return; // PaperSpigot - Stop updating flowing block if material has changed
+         IBlockData iblockdata2 = world.getType(blockposition.down());
+ 
+         if (this.h(world, blockposition.down(), iblockdata2)) {
+-- 
+1.9.5.msysgit.1
+