diff --git a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch
index 51dfa6d50b..c9d9250268 100644
--- a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch
+++ b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch
@@ -77,4 +77,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
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
index 66d97ed0ff..f7e8b451fe 100644
--- a/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch
@@ -57,4 +57,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        log( "Water over lava flow speed: " + waterOverLavaFlowSpeed );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
index 95de84dc89..29aa776308 100644
--- a/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
@@ -46,4 +46,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch
index 9f57aa703f..44a2aeb5f5 100644
--- a/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch
+++ b/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch
@@ -39,6 +39,48 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public int fallingBlockHeightNerf;
 +    private void fallingBlockheightNerf()
 +    {
++        // TODO: Remove migrations after most users have upgraded.
++        if ( PaperSpigotConfig.version < 8 )
++        {
++            // Migrate default value
++
++            int heightNerf = config.getInt( "world-settings.default.falling-block-height-nerf", 0 );
++            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings.default.tnt-entity-height-nerf", 0 );
++            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", 0 );
++            if ( heightNerf != 0 ) config.set( "world-settings.default.falling-block-height-nerf", heightNerf );
++
++            if ( config.contains( "world-settings.default.tnt-entity-height-nerf" ) )
++            {
++                config.getDefaults().set( "world-settings.default.tnt-entity-height-nerf", null );
++                config.set( "world-settings.default.tnt-entity-height-nerf", null );
++            }
++
++            if ( config.contains( "world-settings.default.tnt-gameplay.tnt-entity-height-limit" ) )
++            {
++                config.getDefaults().set( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", null );
++                config.set( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", null );
++            }
++
++            // Migrate world setting
++
++            heightNerf = config.getInt( "world-settings." + worldName + ".falling-block-height-nerf" );
++            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings." + worldName + ".tnt-entity-height-nerf", 0 );
++            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", 0 );
++            if ( heightNerf != 0 ) config.set( "world-settings." + worldName + ".falling-block-height-nerf", heightNerf );
++
++            if ( config.contains( "world-settings." + worldName + ".tnt-entity-height-nerf" ) )
++            {
++                config.getDefaults().set( "world-settings." + worldName + ".tnt-entity-height-nerf", null );
++                config.set( "world-settings." + worldName + ".tnt-entity-height-nerf", null);
++            }
++
++            if ( config.contains( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit" ) )
++            {
++                config.getDefaults().set( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", null );
++                config.set( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", null );
++            }
++        }
++
 +        fallingBlockHeightNerf = getInt( "falling-block-height-nerf", 0 );
 +        if ( fallingBlockHeightNerf != 0 )
 +        {
@@ -46,4 +88,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/PaperSpigot-config-files.patch b/Spigot-Server-Patches/PaperSpigot-config-files.patch
index 5573c2efc6..06843cbffd 100644
--- a/Spigot-Server-Patches/PaperSpigot-config-files.patch
+++ b/Spigot-Server-Patches/PaperSpigot-config-files.patch
@@ -147,8 +147,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +        commands = new HashMap<String, Command>();
 +
-+        version = getInt( "config-version", 7 );
-+        set( "config-version", 7 );
++        version = getInt( "config-version", 8 );
++        set( "config-version", 8 );
 +        readConfig( PaperSpigotConfig.class, null );
 +    }
 +
@@ -316,4 +316,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
 +    }
 +}
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
index fad5fb2982..8c3f5aa23a 100644
--- a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
+++ b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
@@ -115,4 +115,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        removeUnloadedFallingBlocks = getBoolean( "remove-unloaded.falling-blocks", true );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch
index 0cb626088f..adc151ef6d 100644
--- a/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch
@@ -36,4 +36,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        log( "Remove invalid mob spawner tile entities: " + removeInvalidMobSpawnerTEs );
 +    }
  }
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+