diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 9807e265a..7e538ecd6 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,6 @@
+June 17, 2006 (Changes by Graf Zahl)
+- Fixed: The secret map check didn't work for maps inside Zips.
+
 June 14, 2006
 - Fixed loading of Build/Blood maps.
 - FWadLump::Read() now handles Blood decryption directly.
diff --git a/src/g_level.cpp b/src/g_level.cpp
index 466e997b9..5a5250efd 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1650,8 +1650,10 @@ void G_DoCompleted (void)
 		wminfo.next[0] = 0;
 		if (secretexit)
 		{
-			if (Wads.CheckNumForName (level.secretmap) != -1)
+			MapData * map = P_OpenMapData(level.secretmap);
+			if (map != NULL)
 			{
+				delete map;
 				strncpy (wminfo.next, level.secretmap, 8);
 				strncpy (wminfo.lname1, FindLevelInfo (level.secretmap)->pname, 8);
 			}
diff --git a/wadsrc/decorate/hexen/puzzleitems.txt b/wadsrc/decorate/hexen/puzzleitems.txt
index bba74c403..c3bdf29ba 100644
--- a/wadsrc/decorate/hexen/puzzleitems.txt
+++ b/wadsrc/decorate/hexen/puzzleitems.txt
@@ -229,7 +229,7 @@ ACTOR PuzzMWeapon : PuzzleItem 9017
 
 // Clock Gear 1 -------------------------------------------------------------
 
-ACTOR PuzzGear : PuzzleItem 9018
+ACTOR PuzzGear1 : PuzzleItem 9018
 {
 	Game Hexen
 	PuzzleItem.Number 13