diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index aa16db21b4ab..cff977f6d941 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -2,85 +2,75 @@
 # $FreeBSD$
 
 PORTNAME=	eduke32
-PORTVERSION=	20110627
-PORTREVISION=	5
+PORTVERSION=	20150830
 CATEGORIES=	games
 MASTER_SITES=	http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \
 		http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pkubaj@riseup.net
 COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/GNU.TXT
+LICENSE_FILE=	${WRKSRC}/source/gpl-2.0.txt
 
-USES=		execinfo gmake tar:bzip2
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libvpx.so:${PORTSDIR}/multimedia/libvpx
+
+USES=		execinfo gmake tar:xz
 USE_GCC=	any
-USE_CSTD=	gnu89
-USE_GL=		gl
+USE_GL=		gl glu
 USE_GNOME=	gtk20
-USE_SDL=	mixer sdl
+USE_SDL=	sdl2 mixer2
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION}
-SVNREVISION=	1923
+SVNREVISION=	5338
 
 PLIST_FILES=	bin/eduke32 bin/mapster32
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-BROKEN_sparc64=		Does not compile on sparc64
+BROKEN_sparc64=	does not compile on sparc64
 
-OPTIONS_DEFINE=	VORBIS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_RADIO=	MIDI
 OPTIONS_RADIO_MIDI=	TIMIDITY TIMIDITYPLUS
-OPTIONS_DEFAULT=TIMIDITY VORBIS
+OPTIONS_DEFAULT=TIMIDITY
+OPTIONS_DEFINE_i386=	ASM
+OPTIONS_DEFAULT_i386=	ASM
 
+ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 MIDI_DESC=	MIDI music support
 TIMIDITY_DESC=	Use Timidity for music support
 TIMIDITY_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 TIMIDITYPLUS_DESC=	Use Timidity++ for music support
 TIMIDITYPLUS_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity++
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 .include "${.CURDIR}/../duke3d-data/Makefile.include"
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-.endif
-
 post-patch:
-.if ! ${PORT_OPTIONS:MVORBIS}
-	@${REINPLACE_CMD} '/+= -lvorbis/d' ${WRKSRC}/Makefile
-.endif
-.if ${ARCH} != "i386"
-	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common
-.endif
-	@${REINPLACE_CMD} -e '/^CC=/s/gcc/${CC}/' -e '/^CXX=/s/g++/${CXX}/' \
+	@${REINPLACE_CMD} -e '/^CC=/s|gcc|${CC}|' -e '/^CXX=/s|g++|${CXX}|' \
 		${WRKSRC}/Makefile.common
-	@${REINPLACE_CMD} 's/ \$$(ARCH)//' ${WRKSRC}/Makefile \
-		${WRKSRC}/build/Makefile
-	@${REINPLACE_CMD} -Ee '/^ifeq/s/LINUX/BSD/' \
-		-e 's/(\+= -lvorbisfile)/\1 -lexecinfo/' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' -e 's/ -ldl//' \
-		${WRKSRC}/build/Makefile
-	@${REINPLACE_CMD} -E 's|(SDLCONFIG[[:space:]]*=).*|\1${SDL_CONFIG}|' \
-		${WRKSRC}/build/Makefile.shared
 	@${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DN3DDIR}|' \
 		${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
-	@${REINPLACE_CMD} -E 's|(-DHAVE_VORBIS)|-I${LOCALBASE}/include \1|' \
-		${WRKSRC}/source/jaudiolib/Makefile
+
+post-patch-ASM-off:
+	@${REINPLACE_CMD} '/^NOASM =/s/0/1/' ${WRKSRC}/Makefile.common
 
 do-install:
-.for f in eduke32 mapster32
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
-.endfor
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/samples/*.sample ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-. for f in cfg map m32 txt
-	${INSTALL_DATA} ${WRKSRC}/samples/*.${f} ${STAGEDIR}${EXAMPLESDIR}
-. endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.sample ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.map ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.m32 ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/package/sdk/*.cfg ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/*.txt ${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff --git a/games/eduke32/distinfo b/games/eduke32/distinfo
index f0943c782d0d..839d1ce42e03 100644
--- a/games/eduke32/distinfo
+++ b/games/eduke32/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eduke32_src_20110627-1923.tar.bz2) = 6ad33f7acf9cdd26ca49f7813fbe23b888b95fd2f587851c971f860b59185e4a
-SIZE (eduke32_src_20110627-1923.tar.bz2) = 2817419
+SHA256 (eduke32_src_20150830-5338.tar.xz) = 122375d58eb800e6b1eb4856757fccc3c6f463e5b724a866afc7ab6d84b1a0c2
+SIZE (eduke32_src_20150830-5338.tar.xz) = 14328856