diff --git a/sql/mangos.sql b/sql/mangos.sql
index bfcacd221..aae268e12 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_9015_01_mangos_spell_bonus_data` bit(1) default NULL
+  `required_9018_01_mangos_spell_bonus_data` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -14036,6 +14036,7 @@ INSERT INTO `spell_bonus_data` VALUES
 /* Druid */
 (5185,  1.6104, 0,       0,     'Druid - Healing Touch'),
 (339,   0,      0.1,     0,     'Druid - Entangling Roots'),
+(60089, 0,      0,       0.05,  'Druid - Faerie Fire (Feral) Triggered'),
 (42231, 0.12898,0,       0,     'Druid - Hurricane Triggered'),
 (5570,  0,      0.2,     0,     'Druid - Insect Swarm'),
 (33763, 0,      0.09518, 0,     'Druid - Lifebloom'),
diff --git a/sql/updates/9018_01_mangos_spell_bonus_data.sql b/sql/updates/9018_01_mangos_spell_bonus_data.sql
new file mode 100644
index 000000000..a1cd63a0e
--- /dev/null
+++ b/sql/updates/9018_01_mangos_spell_bonus_data.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_9015_01_mangos_spell_bonus_data required_9018_01_mangos_spell_bonus_data bit;
+
+DELETE FROM spell_bonus_data WHERE entry = 60089;
+INSERT INTO spell_bonus_data VALUES
+(60089,0,0,0.05,'Druid - Faerie Fire (Feral) Triggered');
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index a6ba8b72d..6ccc1d03d 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -213,6 +213,7 @@ pkgdata_DATA = \
 	9007_01_mangos_spell_proc_event.sql \
 	9010_01_realmd_realmlist.sql \
 	9015_01_mangos_spell_bonus_data.sql \
+	9018_01_mangos_spell_bonus_data.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -406,4 +407,5 @@ EXTRA_DIST = \
 	9007_01_mangos_spell_proc_event.sql \
 	9010_01_realmd_realmlist.sql \
 	9015_01_mangos_spell_bonus_data.sql \
+	9018_01_mangos_spell_bonus_data.sql \
 	README
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 350eb4030..101c7b7c5 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2525,6 +2525,13 @@ void Spell::cast(bool skipCheck)
             }
             break;
         }
+        case SPELLFAMILY_DRUID:
+        {
+            // Faerie Fire (Feral)
+            if (m_spellInfo->Id == 16857 && m_caster->m_form != FORM_CAT)
+                AddTriggeredSpell(60089);
+            break;
+        }
         case SPELLFAMILY_ROGUE:
             // Fan of Knives (main hand)
             if (m_spellInfo->Id == 51723 && m_caster->GetTypeId() == TYPEID_PLAYER &&
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index cc0ad5ed1..be2f9a893 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 "9017"
+ #define REVISION_NR "9018"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index 168dbac0b..9a3c03faa 100644
--- a/src/shared/revision_sql.h
+++ b/src/shared/revision_sql.h
@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_8874_01_characters_character_skills"
- #define REVISION_DB_MANGOS "required_9015_01_mangos_spell_bonus_data"
+ #define REVISION_DB_MANGOS "required_9018_01_mangos_spell_bonus_data"
  #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
 #endif // __REVISION_SQL_H__