diff --git a/CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch
new file mode 100644
index 000000000..225caf9b1
--- /dev/null
+++ b/CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch
@@ -0,0 +1,64 @@
+From 68cc023172c4fdba4222e83807b2550be3f547ca Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sun, 24 Feb 2013 20:45:20 +1100
+Subject: [PATCH] Enable Improved ping sending
+
+ 3 files changed, 18 insertions(+)
+
+ 3 files changed, 18 insertions(+)
+
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index 735eb8a..b23b9ce 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+     public int newLevel = 0;
+     public int newTotalExp = 0;
+     public boolean keepLevel = false;
++    public int lastPing = -1; // Spigot
+     // CraftBukkit end
+ 
+     public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
+diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+index eaeb0bf..f94cc54 100644
+--- a/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/PlayerList.java
+@@ -722,7 +722,23 @@ public abstract class PlayerList {
+             this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.ping));
+         }
+         // CraftBukkit end */
++        // Spigot start
++        if (this.players.size() == 0 || !org.bukkit.craftbukkit.Spigot.tabPing) {
++            return;
++        }
++        int index = MinecraftServer.currentTick % this.players.size();
++        EntityPlayer player = (EntityPlayer) this.players.get(index);
++        if (player.lastPing == -1 || Math.abs(player.ping - player.lastPing) > 20) {
++            Packet packet = new Packet201PlayerInfo(player.listName, true, player.ping);
++            for (EntityPlayer splayer : (List<EntityPlayer>) this.players) {
++                if (splayer.getBukkitEntity().canSee(player.getBukkitEntity())) {
++                    splayer.playerConnection.sendPacket(packet);
++                }
++            }
++            player.lastPing = player.ping;
++        }
+     }
++    // Spigot end
+ 
+     public void sendAll(Packet packet) {
+         for (int i = 0; i < this.players.size(); ++i) {
+diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
+index e440750..bc0b044 100644
+--- a/src/main/resources/configurations/bukkit.yml
++++ b/src/main/resources/configurations/bukkit.yml
+@@ -31,6 +31,7 @@ settings:
+     command-complete: true
+     spam-exclusions:
+        - /skill
++    tab-ping: false
+     timeout-time: 30
+     restart-on-crash: false
+     restart-script-location: /path/to/server/start.sh
+-- 
+1.8.2.1
+