diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg
index e1d4a30dd3..76c3f62005 100644
--- a/trunk/dist/game/data/scripts.cfg
+++ b/trunk/dist/game/data/scripts.cfg
@@ -61,6 +61,7 @@ ai/npc/Sirra/Sirra.java
 ai/npc/Summons/MerchantGolem/GolemTrader.java
 ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
 ai/npc/SymbolMaker/SymbolMaker.java
+ai/npc/Teleports/AnghelWaterfallToArcan/AnghelWaterfallToArcan.java
 ai/npc/Teleports/CrumaTower/CrumaTower.java
 ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
 ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallToArcan/AnghelWaterfallToArcan.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallToArcan/AnghelWaterfallToArcan.java
new file mode 100644
index 0000000000..1a01f613a2
--- /dev/null
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallToArcan/AnghelWaterfallToArcan.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2004-2015 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.npc.Teleports.AnghelWaterfallToArcan;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * Anghel Waterfall to Arcan teleport AI.
+ * @author Mobius
+ */
+public final class AnghelWaterfallToArcan extends AbstractNpcAI
+{
+	private static final int ZONE_ID = 200200;
+	private static final Location TELEPORT_LOC = new Location(207559, 86429, -1000);
+	
+	private AnghelWaterfallToArcan()
+	{
+		super(AnghelWaterfallToArcan.class.getSimpleName(), "ai/npc/Teleports");
+		addEnterZoneId(ZONE_ID);
+	}
+	
+	@Override
+	public String onEnterZone(L2Character character, L2ZoneType zone)
+	{
+		if (character.isPlayer())
+		{
+			final L2PcInstance player = character.getActingPlayer();
+			player.teleToLocation(TELEPORT_LOC);
+		}
+		return super.onEnterZone(character, zone);
+	}
+	
+	public static void main(String[] args)
+	{
+		new AnghelWaterfallToArcan();
+	}
+}
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/npcs/32900-33000.xml b/trunk/dist/game/data/stats/npcs/32900-33000.xml
index 020c708e93..523b732577 100644
--- a/trunk/dist/game/data/stats/npcs/32900-33000.xml
+++ b/trunk/dist/game/data/stats/npcs/32900-33000.xml
@@ -171,7 +171,6 @@
 		</collision>
 	</npc>
 	<npc id="32910" level="85" type="L2Npc" name="Teleport Portal" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -181,7 +180,7 @@
 				<run ground="120" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" talkable="false" targetable="false" />
 		<collision>
 			<radius normal="9.5" />
 			<height normal="22.4" />
diff --git a/trunk/dist/game/data/zones/custom_script.xml b/trunk/dist/game/data/zones/custom_script.xml
index c8ac1594f0..21c1823ddd 100644
--- a/trunk/dist/game/data/zones/custom_script.xml
+++ b/trunk/dist/game/data/zones/custom_script.xml
@@ -303,4 +303,10 @@
 		<node X="109830" Y="-39550" />
 		<node X="110457" Y="-39540" />
 	</zone>
+	<zone name="anghel_waterfall_to_arcan_teleport" id="200200" type="ScriptZone" shape="NPoly" minZ="-2300" maxZ="-2100">
+		<node X="175138" Y="90354" />
+		<node X="175190" Y="90797" />
+		<node X="175079" Y="90835" />
+		<node X="175037" Y="90334" />
+	</zone>
 </list>
\ No newline at end of file
diff --git a/trunk/dist/tools/sql/game/spawnlist.sql b/trunk/dist/tools/sql/game/spawnlist.sql
index e4bc5a3b60..b2d3b19261 100644
--- a/trunk/dist/tools/sql/game/spawnlist.sql
+++ b/trunk/dist/tools/sql/game/spawnlist.sql
@@ -44512,3 +44512,6 @@ INSERT INTO `spawnlist` VALUES ('26_20', '1', '31829', '207160', '86781', '-1027
 INSERT INTO `spawnlist` VALUES ('26_20', '1', '33587', '207143', '86733', '-1028', '0', '0', '21143', '0', '0', '0', '0');
 INSERT INTO `spawnlist` VALUES ('26_20', '1', '32327', '207205', '86800', '-1028', '0', '0', '57343', '0', '0', '0', '0');
 INSERT INTO `spawnlist` VALUES ('26_20', '1', '33956', '207236', '86780', '-1028', '0', '0', '25730', '0', '0', '0', '0');
+
+-- Anghel Waterfall Portal to Arcan
+INSERT INTO `spawnlist` VALUES ('25_20', '1', '32910', '175148', '90632', '-2202', '0', '0', '0', '60', '0', '0', '0');