diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index cad9455efc..d151c5ff35 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2008/06/06
+	* Rev. 12761 Added mapflags in preparation for Monster Races. [L0ne_W0lf]
 2008/06/01
 	* Added gm_viewequip_min_lv to gm.conf [ultramage]
 2008/05/28
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index c4535c7009..575cab05b1 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -320,6 +320,10 @@ turbo_e_4	mapflag	nobranch
 turbo_e_8	mapflag	nobranch
 turbo_e_16	mapflag	nobranch
 
+//Monster Races ================
+p_track01	mapflag	nobranch
+p_track02	mapflag	nobranch
+
 //Battle Fields ================
 bat_room	mapflag	nobranch
 bat_a01	mapflag	nobranch
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 7e097bb054..5323dde8ae 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -588,6 +588,10 @@ turbo_e_4	mapflag	nomemo
 turbo_e_8	mapflag	nomemo
 turbo_e_16	mapflag	nomemo
 
+//Monster Races ================
+p_track01	mapflag	nomemo
+p_track02	mapflag	nomemo
+
 //Battle Fields ==============
 bat_room	mapflag	nomemo
 bat_a01	mapflag	nomemo
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index a2800f61be..f158ac8c2e 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -241,6 +241,10 @@ turbo_e_4	mapflag	nopenalty
 turbo_e_8	mapflag	nopenalty
 turbo_e_16	mapflag	nopenalty
 
+//Monster Races ================
+p_track01	mapflag	nopenalty
+p_track02	mapflag	nopenalty
+
 //Battle Fields =================
 bat_room	mapflag	nopenalty
 bat_a01	mapflag	nopenalty
diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt
index 91af43c3dd..68319ab614 100644
--- a/conf/mapflag/nosave.txt
+++ b/conf/mapflag/nosave.txt
@@ -210,6 +210,10 @@ turbo_e_4	mapflag	nosave	SavePoint
 turbo_e_8	mapflag	nosave	SavePoint
 turbo_e_16	mapflag	nosave	SavePoint
 
+//Monster Races ================
+p_track01	mapflag	nosave	SavePoint
+p_track02	mapflag	nosave	SavePoint
+
 //Battle Fields ===============================
 bat_room	mapflag	nosave	SavePoint
 bat_a01	mapflag	nosave	SavePoint
diff --git a/conf/mapflag/noskill.txt b/conf/mapflag/noskill.txt
new file mode 100644
index 0000000000..9020cee8af
--- /dev/null
+++ b/conf/mapflag/noskill.txt
@@ -0,0 +1,11 @@
+//===== eAthena Script =======================================
+//= Map flags that disable skills on a map
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.0 [L0ne_W0lf]
+//===== Current Version: =====================================
+
+//Monster Races ================
+p_track01	mapflag	noskill
+
+p_track02	mapflag	noskill
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index a5167b2a96..20dc1a1ee9 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -287,6 +287,10 @@ turbo_e_4	mapflag	noteleport
 turbo_e_8	mapflag	noteleport
 turbo_e_16	mapflag	noteleport
 
+//Monster Races ================
+p_track01	mapflag	noteleport
+p_track02	mapflag	noteleport
+
 //Battle Fields ==================
 bat_room	mapflag	noteleport
 bat_a01	mapflag	noteleport
diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt
index 34a04b1ee5..e7c9103268 100644
--- a/conf/mapflag/nowarp.txt
+++ b/conf/mapflag/nowarp.txt
@@ -54,3 +54,6 @@ turbo_n_16	mapflag	nowarp
 turbo_e_4	mapflag	nowarp
 turbo_e_8	mapflag	nowarp
 turbo_e_16	mapflag	nowarp
+//Monster Races ================
+p_track01	mapflag	nowarp
+p_track02	mapflag	nowarp
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index 16e9870461..d3f74dd9af 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -70,6 +70,10 @@ force_1-2	mapflag	nowarpto
 force_1-3	mapflag	nowarpto
 prt_are_in	mapflag	nowarpto
 
+//Monster Races ================
+p_track01	mapflag	nowarpto
+p_track02	mapflag	nowarpto
+
 //Battle Fields ================
 bat_room	mapflag	nowarpto
 bat_a01	mapflag	nowarpto
diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf
index d055c85bf9..74bdcd007a 100644
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -15,6 +15,7 @@ npc: conf/mapflag/nopvp.txt
 npc: conf/mapflag/nosave.txt
 npc: conf/mapflag/noteleport.txt
 npc: conf/mapflag/noreturn.txt
+npc: conf/mapflag/noskill.txt
 npc: conf/mapflag/nowarp.txt
 npc: conf/mapflag/nowarpto.txt
 npc: conf/mapflag/pvp.txt