diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f50ea88129..0afe5eb168 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -2,6 +2,7 @@ Date		Added
 ======
 2007/06/07
 	* Fixed a bug and some typos to Socket Enchant NPC. [SinSloth]
+	- Added totally custom Moscovia warps by Azazel [Lupus]
 2007/06/06
 	* More Breeder fixes [Playtester]
 	* Added Dandelion's Request / Morroc Invasion quest. [SinSloth]
diff --git a/npc/cities/moscovia_custom.txt b/npc/cities/moscovia_custom.txt
new file mode 100644
index 0000000000..d03013d789
--- /dev/null
+++ b/npc/cities/moscovia_custom.txt
@@ -0,0 +1,23 @@
+//===== eAthena Script ==================================================
+//= Moscovia Dungeon / Field Warp Script.
+//===== By: =============================================================
+//= Azazel
+//===== Current Version: ================================================
+//= 1.0
+//===== Compatible With: ================================================
+//= Any Athena Version
+//===== Description: ====================================================
+//= 
+//===== Additional Comments: ============================================
+//= 1.0 100% Custom (just to walk and check)
+//=======================================================================
+
+//= Moscovia ================================================
+mosk_fild02.gat,190,257,0	warp	moscovia008	1,1,mosk_dun01.gat,189,45
+
+//= Deep Wood ================================================
+mosk_dun01.gat,189,42,0	warp	moscovia009	1,1,mosk_fild02.gat,190,254
+mosk_dun01.gat,200,273,0	warp	moscovia010	1,1,mosk_dun02.gat,164,31
+mosk_dun02.gat,167,28,0	warp	moscovia011	1,1,mosk_dun01.gat,200,270
+mosk_dun02.gat,267,117,0	warp	moscovia012	1,1,mosk_dun03.gat,32,135
+mosk_dun03.gat,29,132,0	warp	moscovia013	1,1,mosk_dun02.gat,264,117
\ No newline at end of file
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 55c5046714..c7a19f48a3 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -31,6 +31,7 @@ npc: npc/warps/cities/lighthalzen.txt
 npc: npc/warps/cities/louyang.txt
 npc: npc/warps/cities/lutie.txt
 npc: npc/warps/cities/morroc.txt
+//npc: npc/warps/cities/moscovia_custom.txt
 npc: npc/warps/cities/nameless.txt
 npc: npc/warps/cities/niflheim.txt
 npc: npc/warps/cities/payon.txt