diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f49a2b296a..e380d8ba6f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,7 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/05/19
-	* grfio_final moved back to do_final since it's used by @reloaditemdb. [Lance]
+	* grfio_final moved back if any of GRF overriding is enabled so servers
+	  with such configuration will not have different values after reloading. [Lance]
 	* jA1983 script.c buildin_menu fix. Thanks to End_of_exam. [Lance]
 	* Abit of alterations to login-server. [Lance]
 2006/05/19
diff --git a/src/map/map.c b/src/map/map.c
index b675303909..350cba4a09 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3658,7 +3658,9 @@ void do_final(void) {
 	//map_cache_close();
 
 	// We probably don't need the grfio after server bootup 'yet' too. So this is closed near the end of do_init [Lance]
-	grfio_final(); // Reverted since itemdb refresh needs it temperory.
+	if((battle_config.cardillust_read_grffile || battle_config.item_equip_override_grffile || 
+		battle_config.item_slots_override_grffile || battle_config.item_name_override_grffile))
+		grfio_final();
 
 	for (i = 0; i < map_num; i++)
 		if (map[i].m >= 0)
@@ -3950,12 +3952,15 @@ int do_init(int argc, char *argv[]) {
 	if (battle_config.pk_mode == 1)
 		ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n");
 
-	//grfio_final(); // Unused after reading all maps.
+	if(!(battle_config.cardillust_read_grffile || battle_config.item_equip_override_grffile || 
+		battle_config.item_slots_override_grffile || battle_config.item_name_override_grffile))
+		grfio_final(); // Unused after reading all maps.
+
 	//However, some reload functions still use it,disable them.
-	battle_config.cardillust_read_grffile =
-	battle_config.item_equip_override_grffile =
-	battle_config.item_slots_override_grffile =
-	battle_config.item_name_override_grffile = 0;
+	//battle_config.cardillust_read_grffile =
+	//battle_config.item_equip_override_grffile =
+	//battle_config.item_slots_override_grffile =
+	//battle_config.item_name_override_grffile = 0;
 
 	ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map_port);