diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index d58f3e083d..7d7189082d 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2006/11/05
+	* Added maplags for PowerNPC quest. [KarLaeda]
 2006/10/31
 	* Modified the player_cloak_check_type and monster_cloak_check_type
 	  settings. 1 makes it check for walls, 2 makes cloaking NOT end on normal
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index b647f8c4bd..93a12d6158 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -2,7 +2,7 @@
 //= Map flags that disable auto saving
 //===== By: ==================================================
 //= eAthena Dev Team
-//= 1.5 [Lupus]
+//= 1.6 [Lupus]
 //===== Current Version: =====================================
 
 // Job Quests ====================
@@ -37,6 +37,7 @@ que_sign01.gat	mapflag	nosave	SavePoint
 que_sign02.gat	mapflag	nosave	SavePoint
 que_rachel.gat	mapflag	nosave	SavePoint
 que_ng.gat	mapflag	nosave	SavePoint
+gon_test.gat	mapflag	nosave	SavePoint
 
 // GvG Arenas ==========================
 guild_vs1.gat	mapflag	nosave	SavePoint
@@ -148,8 +149,6 @@ pvp_n_8-4.gat	mapflag	nosave	SavePoint
 pvp_n_8-5.gat	mapflag	nosave	SavePoint
 pvp_2vs2.gat	mapflag	nosave	SavePoint
 
-//gon_test.gat	mapflag	nosave	prontera.gat,150,180
-
 //WoE Castles =================================
 aldeg_cas01.gat	mapflag	nosave	SavePoint
 aldeg_cas02.gat	mapflag	nosave	SavePoint
diff --git a/conf-tmpl/mapflag/nowarp.txt b/conf-tmpl/mapflag/nowarp.txt
index a92ec31438..62dd7b29cc 100644
--- a/conf-tmpl/mapflag/nowarp.txt
+++ b/conf-tmpl/mapflag/nowarp.txt
@@ -2,10 +2,14 @@
 //= Map flags that disable warp
 //===== By: ==================================================
 //= eAthena Dev Team
-//= v 1.1a
+//= v 1.2
 //===== Current Version: =====================================
 
+// Special Quests Places =====
 ama_test.gat	mapflag	nowarp
+gon_test.gat	mapflag	nowarp
+
+// Guild Castles =============
 aldeg_cas01.gat	mapflag	nowarp
 aldeg_cas02.gat	mapflag	nowarp
 aldeg_cas03.gat	mapflag	nowarp
diff --git a/conf-tmpl/mapflag/nowarpto.txt b/conf-tmpl/mapflag/nowarpto.txt
index 27fc656367..955f931eb6 100644
--- a/conf-tmpl/mapflag/nowarpto.txt
+++ b/conf-tmpl/mapflag/nowarpto.txt
@@ -2,7 +2,7 @@
 //= Map flags that disable warpto
 //===== By: ==================================================
 //= eAthena Dev Team
-//= v 1.2
+//= v 1.3
 //===== Current Version: =====================================
 
 // Guild Castles ========================
@@ -37,5 +37,6 @@ nguild_pay.gat	mapflag	nowarpto
 nguild_prt.gat	mapflag	nowarpto
 //Lighthalzen Bio-Lab 3F
 lhz_dun03.gat	mapflag	nowarpto
-//Momotaro Event
+// Special Quests Places =======
 ama_test.gat	mapflag	nowarpto
+gon_test.gat	mapflag	nowarpto
\ No newline at end of file