diff --git a/sql/mangos.sql b/sql/mangos.sql
index a7a331844..6cd60c935 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -22,7 +22,7 @@
 DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
-  `required_7207_02_mangos_gameobject` bit(1) default NULL
+  `required_7209_01_mangos_spell_bonus_data` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -17287,6 +17287,7 @@ INSERT INTO `spell_bonus_data` VALUES
 ('53719', '0.25', '0', '0.16', 'Paladin - Seal of The Martyr Enemy Proc'),
 ('53718', '0.25', '0', '0.16', 'Paladin - Seal of The Martyr Self Proc'),
 ('25742', '0.07', '0', '0.039', 'Paladin - Seal of Righteousness Dummy Proc'),
+('53595', '0', '0', '0','Paladin - Hammer of the Righteous'),
 ('31803', '0', '0.013', '0.15', 'Paladin - Holy Vengeance'),
 ('52042', '0.045', '0', '0', 'Shaman - Healing Stream Totem Triggered Heal'),
 ('32546', '0.8068', '0', '0', 'Priest - Binding Heal'),
diff --git a/sql/updates/7209_01_mangos_spell_bonus_data.sql b/sql/updates/7209_01_mangos_spell_bonus_data.sql
new file mode 100644
index 000000000..bbd36b3e6
--- /dev/null
+++ b/sql/updates/7209_01_mangos_spell_bonus_data.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_7207_02_mangos_gameobject required_7209_01_mangos_spell_bonus_data bit;
+
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (53595);
+INSERT INTO `spell_bonus_data` VALUES
+('53595', '0', '0', '0','Paladin - Hammer of the Righteous');
\ No newline at end of file
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index 9de550c98..1d1fa4067 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -162,6 +162,7 @@ pkgdata_DATA = \
 	7207_01_mangos_creature.sql \
 	7207_02_mangos_gameobject.sql \
 	7207_03_characters_corpse.sql \
+	7209_01_mangos_spell_bonus_data.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -304,4 +305,5 @@ EXTRA_DIST = \
 	7207_01_mangos_creature.sql \
 	7207_02_mangos_gameobject.sql \
 	7207_03_characters_corpse.sql \
+	7209_01_mangos_spell_bonus_data.sql \
 	README
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 9a78cfea3..5c76ab171 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -583,6 +583,14 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
                                  m_caster->SpellBaseDamageBonusForVictim(GetSpellSchoolMask(m_spellInfo), unitTarget);
                     damage += int32(ap * 0.15f) + int32(holy * 15 / 100);
                 }
+                // Hammer of the Righteous
+                else if(m_spellInfo->SpellFamilyFlags&0x0004000000000000LL)
+                {
+                    // Add main hand dps * effect[2] amount
+                    float averange = (m_caster->GetFloatValue(UNIT_FIELD_MINDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2;
+                    int32 count = m_caster->CalculateSpellDamage(m_spellInfo, 2, m_spellInfo->EffectBasePoints[2], unitTarget);
+                    damage += count * int32(averange * 1000) / m_caster->GetAttackTime(BASE_ATTACK);
+                }
                 break;
             }
         }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 83106d8bd..0fc46b32f 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 "7208"
+ #define REVISION_NR "7209"
 #endif // __REVISION_NR_H__