diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 096fb8850f16..d5cbdb4151e3 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	zsnes
-PORTVERSION=	1.337
+PORTVERSION=	1.35
+PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,14 +16,12 @@ DISTNAME=	zsnes${PORTVERSION:S/.//}src
 MAINTAINER=	stijn@win.tue.nl
 
 # This must be >= 0.98!
-BUILD_DEPENDS=	nasm-0.98:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm-0.98.33:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_ZIP=	yes
-EXTRACT_BEFORE_ARGS=	-q -a
 
 MAN1=		zsnes.1
 
@@ -32,12 +31,9 @@ ONLY_FOR_ARCHS=	i386
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 
-WRKSRC=		${WRKDIR}/zsnes/src
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 GNU_CONFIGURE=	yes
-ALL_TARGET=	
-
-pre-configure:
-		cd ${WRKSRC} && chmod +x configure
+ALL_TARGET=	ALL
 
 .include <bsd.port.mk>
diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo
index 334ecf1199d4..a19abb756671 100644
--- a/emulators/zsnes/distinfo
+++ b/emulators/zsnes/distinfo
@@ -1 +1 @@
-MD5 (zsnes1337src.zip) = 0d52bb1015d8cea39effd83951423139
+MD5 (zsnes135src.tar.gz) = 669ec6ad2709f2f04e0bd5003c915cb1
diff --git a/emulators/zsnes/files/patch-src::Makefile.in b/emulators/zsnes/files/patch-src::Makefile.in
deleted file mode 100644
index 5afa235e2c93..000000000000
--- a/emulators/zsnes/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Oct 29 15:11:59 2001
-+++ Makefile.in	Mon Oct 29 15:12:11 2001
-@@ -170,7 +170,7 @@
- 
- install:
- 	@INSTALL@ -m 0755 @ZSNESEXE@ @prefix@/bin
--	@INSTALL@ -m 0644 linux/zsnes.man @prefix@/man
-+	@INSTALL@ -m 0644 linux/zsnes.man @prefix@/man/man1/zsnes.1
- 
- clean:
- 	rm -f ${CHIPDIR}/*.o  ${CPUDIR}/*.o  ${VIDEODIR}/*.o  ${GUIDIR}/*.o  ${DOSDIR}/*.o  ${WINDIR}/*.o  ${ZIPDIR}/*.o  *.o  @ZSNESEXE@
diff --git a/emulators/zsnes/files/patch-src::linux::sdllink.c b/emulators/zsnes/files/patch-src::linux::sdllink.c
deleted file mode 100644
index 88641e2af231..000000000000
--- a/emulators/zsnes/files/patch-src::linux::sdllink.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- linux/sdllink.c.orig	Sun Sep 23 17:42:52 2001
-+++ linux/sdllink.c	Tue May  7 13:16:21 2002
-@@ -536,6 +536,11 @@
- 
- 	for (i = 0; i < 5; i++)
- 		JoystickInput[i] = NULL;
-+#if 1
-+    printf("ZSNES could not find any joysticks.\n");
-+    SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-+    return FALSE;
-+#else
- 	// If it is possible to use SDL_NumJoysticks
- 	// before initialising SDL_INIT_JOYSTICK then
- 	// this call can be replaced with SDL_InitSubSystem
-@@ -557,6 +562,7 @@
- 	}
- 
- 	return TRUE;
-+#endif
- }
- 
- BOOL InitInput()
-@@ -572,7 +578,11 @@
- 	if (!sdl_inited)
- 	{
- 		if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_TIMER |
--	        SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0)
-+	        SDL_INIT_VIDEO
-+#if 0
-+| SDL_INIT_JOYSTICK
-+#endif
-+		) < 0)
- 		{
- 			fprintf(stderr, "Could not initialize SDL!\n");
- 			return FALSE;