diff --git a/games/dungeon/Makefile b/games/dungeon/Makefile
index 1057c8c7638..e4bd2f4469f 100644
--- a/games/dungeon/Makefile
+++ b/games/dungeon/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/12/06 13:10:38 pascal Exp $
+# $OpenBSD: Makefile,v 1.2 2011/12/06 14:12:19 sthen Exp $
 
 COMMENT =		text adventure game
 
-DISTNAME =		dungeon-2.7s
+PKGNAME =		dungeon-2.7s
+DISTNAME =		dungn27s
+EXTRACT_SUFX =		.zip
 
 CATEGORIES =		games
 
@@ -16,13 +18,13 @@ PERMIT_DISTFILES_FTP =	Yes
 
 WANTLIB =		c termcap
 
-MASTER_SITES =		ftp://ftp.ifarchive.org/if-archive/games/source/ \
-			http://mirror.ifarchive.org/if-archive/games/source/ \
+MASTER_SITES =		http://mirror.ifarchive.org/if-archive/games/source/ \
+			ftp://ftp.ifarchive.org/if-archive/games/source/ \
 			ftp://ftp.funet.fi/pub/misc/if-archive/games/source/ \
 			http://www.vaxdungeon.com/vax-dungeon/Archive/dungeon/ \
 			http://ifarchive.flavorplex.com/if-archive/games/source/
-DISTFILES =		dungn27s.zip
 
+MAKE_FLAGS =		CC="${CC}"
 ALL_TARGET =		dungeon
 
 WRKDIST =		${WRKDIR}
@@ -34,7 +36,7 @@ post-extract:
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/dungeon
-	
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/dungeon.6 ${PREFIX}/man/man6
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dungeon