diff --git a/src/no/runsafe/framework/api/entity/IWitherBoss.java b/src/no/runsafe/framework/api/entity/IWitherBoss.java
new file mode 100644
index 00000000..afed0284
--- /dev/null
+++ b/src/no/runsafe/framework/api/entity/IWitherBoss.java
@@ -0,0 +1,5 @@
+package no.runsafe.framework.api.entity;
+
+public interface IWitherBoss extends ILivingEntity
+{
+}
diff --git a/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java b/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java
index 2fc10f72..5c765b0c 100644
--- a/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java
+++ b/src/no/runsafe/framework/internal/wrapper/ObjectWrapper.java
@@ -479,6 +479,9 @@ public static RunsafeLivingEntity convert(org.bukkit.entity.LivingEntity toWrap)
 		if (toWrap instanceof EnderDragon)
 			return new RunsafeEnderDragon((EnderDragon) toWrap);
 
+		if (toWrap instanceof Wither)
+			return new RunsafeWitherBoss((Wither) toWrap);
+
 		return new RunsafeLivingEntity(toWrap);
 	}
 
diff --git a/src/no/runsafe/framework/minecraft/entity/RunsafeWitherBoss.java b/src/no/runsafe/framework/minecraft/entity/RunsafeWitherBoss.java
new file mode 100644
index 00000000..57e82cff
--- /dev/null
+++ b/src/no/runsafe/framework/minecraft/entity/RunsafeWitherBoss.java
@@ -0,0 +1,16 @@
+package no.runsafe.framework.minecraft.entity;
+
+import no.runsafe.framework.api.entity.IWitherBoss;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Wither;
+
+public class RunsafeWitherBoss extends RunsafeLivingEntity implements IWitherBoss
+{
+	public RunsafeWitherBoss(Wither toWrap)
+	{
+		super(toWrap);
+		wither = toWrap;
+	}
+
+	Wither wither;
+}