diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 4733e1a4d4..ef4b2a7a64 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -32,6 +32,9 @@ Playtester
 
 Date		Added
 ======
+09/02
+	* Fixed some Thanatos Tower warps [Playtester]
+	- I hope Ishizu fixes up the quest soon
 09/01
 	* Added missing next;'s in Payon City NPCs (Thanks $ephiroth) [Evera]
 	* Tried to remove all duplicates (in default NPCs) [Toms]
diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt
index f366b9aadd..a8c2346418 100644
--- a/npc/warps/dungeons/thana_dun.txt
+++ b/npc/warps/dungeons/thana_dun.txt
@@ -58,18 +58,11 @@ tha_t04.gat,60,138,0	warp	WarpThana3b	1,1,tha_t03.gat,60,138
 
 // Thanatos Tower Level 4 (tha_t04.gat)
 tha_t04.gat,82,36,0	warp	WarpThana4a	1,1,tha_t05.gat,62,6
-tha_t05.gat,208,97,0	warp	WarpThana4b	1,1,tha_t04.gat,140,117
 
 // Thanatos Tower Level 5 (tha_t05.gat)
-tha_t05.gat,186,236,0	warp	WarpThana5a	1,1,tha_t06.gat,120,6
-tha_t06.gat,120,3,0	warp	WarpThana5b	1,1,tha_t05.gat,186,233
-tha_t05.gat,61,157,0	script	WarpThana5c	45,1,1,{
-
-  if (rand(2)) warp "tha_t03.gat",139,177;
-  else warp "tha_t06.gat",88,181;
-  end;
-
-}
+tha_t05.gat,61,157,0	warp	WarpThana5a	1,1,tha_t05.gat,211,97
+tha_t05.gat,208,97,0	warp	WarpThana5b	1,1,tha_t05.gat,61,162
+tha_t05.gat,186,236,0	warp	WarpThana5c	1,1,tha_t06.gat,207,6
 
 // Thanatos Tower Level 6 (tha_t06.gat)
 tha_t06.gat,119,120,4	script	WarpThana6a	45,2,2,{