diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c9821a06c9..6787019709 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/04/12
+	* Removed the noteleport mapflags from two juperos maps [MasterOfMuppets]
+	- added the nopenalty mapflag to hugel.gat
 	* Halved the aftercast delay of auto-casted spells. [Skotlex]
 	* Allowed auto-spells to retrigger themselves. [Skotlex]
 	* Changed slave chasing from using unit_walktobl to map_search_freecell +
diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt
index 4a072d5027..8ea4cbcc62 100644
--- a/conf-tmpl/mapflag/nopenalty.txt
+++ b/conf-tmpl/mapflag/nopenalty.txt
@@ -27,6 +27,7 @@ geffen_in.gat	mapflag	nopenalty
 gonryun.gat	mapflag	nopenalty
 gon_in.gat	mapflag	nopenalty
 gon_test.gat	mapflag	nopenalty
+hugel.gat	mapflag	nopenalty
 in_orcs01.gat	mapflag	nopenalty
 izlude.gat	mapflag	nopenalty
 izlude_in.gat	mapflag	nopenalty
diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt
index fc48f78bd7..f14b78da09 100644
--- a/conf-tmpl/mapflag/noteleport.txt
+++ b/conf-tmpl/mapflag/noteleport.txt
@@ -67,8 +67,6 @@ lhz_cube.gat	mapflag	noteleport
 lhz_in01.gat	mapflag	noteleport
 lhz_in02.gat	mapflag	noteleport
 lhz_in03.gat	mapflag	noteleport
-juperos_01.gat	mapflag	noteleport
-juperos_02.gat	mapflag	noteleport
 jupe_area1.gat	mapflag	noteleport
 jupe_area2.gat	mapflag	noteleport
 jupe_core.gat	mapflag	noteleport