diff --git a/src/com/garbagemule/MobArena/MASpawnThread.java b/src/com/garbagemule/MobArena/MASpawnThread.java
index f7516aa..8a9f095 100644
--- a/src/com/garbagemule/MobArena/MASpawnThread.java
+++ b/src/com/garbagemule/MobArena/MASpawnThread.java
@@ -179,6 +179,10 @@ public class MASpawnThread implements Runnable
                         MABoss boss = monsterManager.addBoss(e, maxHealth);
                         bw.addMABoss(boss);
                         bw.activateAbilities(arena);
+                        if (bw.getBossName() != null) {
+                            e.setCustomName(bw.getBossName());
+                            e.setCustomNameVisible(true);
+                        }
                         break;
                     case SWARM:
                         health = (int) (mul < 1D ? e.getMaxHealth() * mul : 1);
diff --git a/src/com/garbagemule/MobArena/waves/WaveParser.java b/src/com/garbagemule/MobArena/waves/WaveParser.java
index e178448..30bfeb3 100644
--- a/src/com/garbagemule/MobArena/waves/WaveParser.java
+++ b/src/com/garbagemule/MobArena/waves/WaveParser.java
@@ -230,6 +230,12 @@ public class WaveParser
         
         BossWave result = new BossWave(monster);
         
+        // Check if there's a specific boss name
+        String bossName = config.getString("name");
+        if (bossName != null && !bossName.equals("")) {
+            result.setBossName(bossName);
+        }
+        
         // Grab the boss health
         String hlth = config.getString("health");
         BossHealth health = BossHealth.fromString(hlth);
diff --git a/src/com/garbagemule/MobArena/waves/types/BossWave.java b/src/com/garbagemule/MobArena/waves/types/BossWave.java
index 4f41742..6f79c19 100644
--- a/src/com/garbagemule/MobArena/waves/types/BossWave.java
+++ b/src/com/garbagemule/MobArena/waves/types/BossWave.java
@@ -20,6 +20,8 @@ import com.garbagemule.MobArena.waves.enums.*;
 
 public class BossWave extends AbstractWave
 {
+    private String bossName;
+    
     private MACreature monster;
     private Set<MABoss> bosses;
     
@@ -52,6 +54,14 @@ public class BossWave extends AbstractWave
         return result;
     }
     
+    public String getBossName() {
+        return bossName;
+    }
+    
+    public void setBossName(String bossName) {
+        this.bossName = bossName;
+    }
+    
     public int getMaxHealth(int playerCount) {
         if (useHealthMultiplier) {
             return (playerCount + 1) * 20 * healthMultiplier;