diff --git a/sql/mangos.sql b/sql/mangos.sql
index 1e201ab29..3472a58b6 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -9713,14 +9713,14 @@ INSERT INTO `playercreateinfo_action` VALUES
 (11,2,0,6603,0,0),
 (11,2,1,21084,0,0),
 (11,2,2,635,0,0),
-(11,2,3,28880,0,0),
+(11,2,3,59542,0,0),
 (11,2,10,159,128,0),
 (11,2,11,4540,128,0),
 (11,2,83,4540,128,0),
 (11,3,0,6603,0,0),
 (11,3,1,2973,0,0),
 (11,3,2,75,0,0),
-(11,3,3,28880,0,0),
+(11,3,3,59543,0,0),
 (11,3,10,159,128,0),
 (11,3,11,4540,128,0),
 (11,3,72,6603,0,0),
@@ -9731,7 +9731,7 @@ INSERT INTO `playercreateinfo_action` VALUES
 (11,5,0,6603,0,0),
 (11,5,1,585,0,0),
 (11,5,2,2050,0,0),
-(11,5,3,28880,0,0),
+(11,5,3,59544,0,0),
 (11,5,10,159,128,0),
 (11,5,11,4540,128,0),
 (11,5,83,4540,128,0),
@@ -9741,16 +9741,17 @@ INSERT INTO `playercreateinfo_action` VALUES
 (11,6,3,45462,0,0),
 (11,6,4,45902,0,0),
 (11,6,5,47541,0,0),
+(11,6,6,59545,0,0),
 (11,7,0,6603,0,0),
 (11,7,1,403,0,0),
 (11,7,2,331,0,0),
-(11,7,3,28880,0,0),
+(11,7,3,59547,0,0),
 (11,7,10,159,128,0),
 (11,7,11,4540,128,0),
 (11,8,0,6603,0,0),
 (11,8,1,133,0,0),
 (11,8,2,168,0,0),
-(11,8,3,28880,0,0),
+(11,8,3,59548,0,0),
 (11,8,10,159,128,0),
 (11,8,11,4540,128,0),
 (11,8,83,4540,128,0);
@@ -12271,7 +12272,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (11,2,22810,'Opening - No Text',1),
 (11,2,27762,'Libram',1),
 (11,2,28875,'Gemcutting',1),
-(11,2,28880,'Gift of the Naaru',1),
+(11,2,59542,'Gift of the Naaru',1),
 (11,2,29932,'Language Draenei',1),
 (11,3,75,'Auto Shot',1),
 (11,3,81,'Dodge',1),
@@ -12308,7 +12309,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (11,3,22810,'Opening - No Text',1),
 (11,3,24949,'Defensive State 2(DND)',1),
 (11,3,28875,'Gemcutting',1),
-(11,3,28880,'Gift of the Naaru',1),
+(11,3,59543,'Gift of the Naaru',1),
 (11,3,29932,'Language Draenei',1),
 (11,3,34082,'Advantaged State(DND)',1),
 (11,5,81,'Dodge',1),
@@ -12344,7 +12345,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (11,5,22810,'Opening - No Text',1),
 (11,5,28875,'Gemcutting',1),
 (11,5,28878,'Inspiring Presence',1),
-(11,5,28880,'Gift of the Naaru',1),
+(11,5,59544,'Gift of the Naaru',1),
 (11,5,29932,'Language Draenei',1),
 (11,6,81,'Dodge',1),
 (11,6,196,'One-Handed Axes',1),
@@ -12450,7 +12451,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (11,7,27763,'Totem',1),
 (11,7,28875,'Gemcutting',1),
 (11,7,28878,'Inspiring Presence',1),
-(11,7,28880,'Gift of the Naaru',1),
+(11,7,59547,'Gift of the Naaru',1),
 (11,7,29932,'Language Draenei',1),
 (11,8,81,'Dodge',1),
 (11,8,133,'Fireball',1),
@@ -12485,7 +12486,7 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (11,8,22810,'Opening - No Text',1),
 (11,8,28875,'Gemcutting',1),
 (11,8,28878,'Inspiring Presence',1),
-(11,8,28880,'Gift of the Naaru',1),
+(11,8,59548,'Gift of the Naaru',1),
 (11,8,29932,'Language Draenei',1);
 /*!40000 ALTER TABLE `playercreateinfo_spell` ENABLE KEYS */;
 UNLOCK TABLES;
diff --git a/sql/updates/01_characters_character_spell.sql b/sql/updates/01_characters_character_spell.sql
new file mode 100644
index 000000000..fa17e0c4c
--- /dev/null
+++ b/sql/updates/01_characters_character_spell.sql
@@ -0,0 +1,9 @@
+DELETE FROM `character_spell` WHERE `spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
+
+INSERT INTO character_spell SELECT characters.guid as guid, 28880, -1, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 1;
+INSERT INTO character_spell SELECT characters.guid as guid, 59542, -1, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 2;
+INSERT INTO character_spell SELECT characters.guid as guid, 59543, -1, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 3;
+INSERT INTO character_spell SELECT characters.guid as guid, 59544, -1, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 5;
+INSERT INTO character_spell SELECT characters.guid as guid, 59545, -1, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 6;
+INSERT INTO character_spell SELECT characters.guid as guid, 59547, -1, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 7;
+INSERT INTO character_spell SELECT characters.guid as guid, 59548, -1, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;
diff --git a/sql/updates/02_mangos_playercreateinfo_action.sql b/sql/updates/02_mangos_playercreateinfo_action.sql
new file mode 100644
index 000000000..834753dcd
--- /dev/null
+++ b/sql/updates/02_mangos_playercreateinfo_action.sql
@@ -0,0 +1,9 @@
+DELETE FROM `playercreateinfo_action` WHERE `action` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
+INSERT INTO `playercreateinfo_action` VALUES
+(11,1,74,28880,0,0),
+(11,2,3,59542,0,0),
+(11,3,3,59543,0,0),
+(11,5,3,59544,0,0),
+(11,6,6,59545,0,0),
+(11,7,3,59547,0,0),
+(11,8,3,59548,0,0);
\ No newline at end of file
diff --git a/sql/updates/03_mangos_playercreateinfo_spell.sql b/sql/updates/03_mangos_playercreateinfo_spell.sql
new file mode 100644
index 000000000..cd55d875a
--- /dev/null
+++ b/sql/updates/03_mangos_playercreateinfo_spell.sql
@@ -0,0 +1,10 @@
+DELETE FROM `playercreateinfo_spell` WHERE `Spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
+
+INSERT INTO `playercreateinfo_spell` VALUES
+(11,1,28880,'Gift of the Naaru',1),
+(11,2,59542,'Gift of the Naaru',1),
+(11,3,59543,'Gift of the Naaru',1),
+(11,5,59544,'Gift of the Naaru',1),
+(11,6,59545,'Gift of the Naaru',1),
+(11,7,59547,'Gift of the Naaru',1),
+(11,8,59548,'Gift of the Naaru',1);
\ No newline at end of file
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 8bdff3b61..eb0a94666 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7046"
+ #define REVISION_NR "7047"
 #endif // __REVISION_NR_H__