diff --git a/sql/mangos.sql b/sql/mangos.sql
index e63075d6d..232b37bce 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_10629_01_mangos_mangos_string` bit(1) default NULL
+  `required_10654_01_mangos_game_event_creature_quest` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -1654,7 +1654,7 @@ CREATE TABLE `game_event_creature_quest` (
   `id` mediumint(8) unsigned NOT NULL default '0',
   `quest` mediumint(8) unsigned NOT NULL default '0',
   `event` smallint(5) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`,`quest`)
+  PRIMARY KEY  (`id`,`quest`,`event`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
diff --git a/sql/updates/10654_01_mangos_game_event_creature_quest.sql b/sql/updates/10654_01_mangos_game_event_creature_quest.sql
new file mode 100644
index 000000000..8c0f8899c
--- /dev/null
+++ b/sql/updates/10654_01_mangos_game_event_creature_quest.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_10629_01_mangos_mangos_string required_10654_01_mangos_game_event_creature_quest bit;
+
+ALTER TABLE game_event_creature_quest DROP PRIMARY KEY;
+ALTER TABLE game_event_creature_quest ADD PRIMARY KEY (id,quest,event);
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index 08ebac8cb..5704e0d2e 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -109,6 +109,7 @@ pkgdata_DATA = \
 	10621_01_mangos_quest_template.sql \
 	10628_01_mangos_mangos_string.sql \
 	10629_01_mangos_mangos_string.sql \
+	10654_01_mangos_game_event_creature_quest.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -198,4 +199,5 @@ EXTRA_DIST = \
 	10621_01_mangos_quest_template.sql \
 	10628_01_mangos_mangos_string.sql \
 	10629_01_mangos_mangos_string.sql \
+	10654_01_mangos_game_event_creature_quest.sql \
 	README
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a417cfaa3..b9457002b 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 "10653"
+ #define REVISION_NR "10654"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index 1e887f499..32d57dd32 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_10568_01_characters_character_tutorial"
- #define REVISION_DB_MANGOS "required_10629_01_mangos_mangos_string"
+ #define REVISION_DB_MANGOS "required_10654_01_mangos_game_event_creature_quest"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__