diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6f9d9b7318..7e605b08fc 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/06/14
+	* [Improved]:
+	  - npc_parse_script to show information and remove duplicated NPCs [Lance]
 2006/06/13
 	* Updated mob_db.sql and item_db.sql to latest. [Skotlex]
 	* Added account_id index to char table. Thanks to Buuyo for reporting it.
diff --git a/src/map/npc.c b/src/map/npc.c
index 8e4182615a..5ba7696d12 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1835,7 +1835,7 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin
 	int startline = 0;
 	unsigned char line[1024];
 	int i;
-	struct npc_data *nd;
+	struct npc_data *nd, *dnd;
 	struct dbt *label_db;
 	char *p;
 	struct npc_label_list *label_dup = NULL;
@@ -1967,6 +1967,11 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin
 	nd->bl.type = BL_NPC;
 	nd->bl.subtype = SCRIPT;
 
+	if((dnd = npc_name2id(nd->exname))){
+		ShowInfo("npc_parse_script: Removing duplicated NPC '%s::%s'...\n", dnd->name, dnd->exname);
+		npc_unload(dnd);
+	}
+
 	for (i = 0; i < MAX_EVENTTIMER; i++)
 		nd->eventtimer[i] = -1;
 	if (m >= 0) {