diff --git a/games/linux-etqw-server/Makefile b/games/linux-etqw-server/Makefile
index 4c52966a9713..264eb40f4539 100644
--- a/games/linux-etqw-server/Makefile
+++ b/games/linux-etqw-server/Makefile
@@ -6,19 +6,22 @@
 #
 
 PORTNAME=	etqw
-PORTVERSION=	1.4.r1
+PORTVERSION=	1.5
 CATEGORIES=	games linux
-MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
+MASTER_SITES=	http://ftp.4players.de/pub/hosted/wolfenstein/users/etqw/server/ \
+		ftp://ftp0.uk.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
+		ftp://ftp0.nl.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
+		${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
 PKGNAMEPREFIX=	linux-
 PKGNAMESUFFIX=	-server
-DISTNAME=	ETQW${PKGNAMESUFFIX}-1.4-full.x86
-DISTFILES=	ETQW${PKGNAMESUFFIX}-1.4-full.x86.run ETQW${PKGNAMESUFFIX}-1.4-hotfix.r1.zip
+DISTNAME=	ETQW${PKGNAMESUFFIX}-1.5-full.x86
+EXTRACT_SUFX=	.run
 
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Enemy Territory: QUAKE Wars Server for Linux
 
 NO_CDROM=	Redistribution is limited
-NO_PACKAGE=	Package will be 428MB, set FORCE_PACKAGE if you really want it
+NO_PACKAGE=	Package will be 435MB, set FORCE_PACKAGE if you really want it
 NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -26,21 +29,18 @@ USE_LINUX=	yes
 USE_ZIP=	yes
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.pre.mk>
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@cd ${WRKSRC} && \
-		${TAIL} -c +194885 ${_DISTDIR}ETQW${PKGNAMESUFFIX}-1.4-full.x86.run > full.zip
+		${TAIL} -c +194885 ${_DISTDIR}ETQW${PKGNAMESUFFIX}-1.5-full.x86.run > full.zip
 	@(cd ${WRKSRC} && ${UNZIP_CMD} -q ${WRKSRC}/full.zip)
 	@${RM} ${WRKSRC}/full.zip
-	@cd ${WRKSRC} && \
-		${UNZIP_CMD} -q ${_DISTDIR}ETQW${PKGNAMESUFFIX}-1.4-hotfix.r1.zip
 
 post-patch:
-	@${MV} ${WRKSRC}/etqwded.x86 ${WRKSRC}/data
-
 	@${SED} -e 's|@ETQWDIR@|${ETQWDIR}|' ${FILESDIR}/etqwded.in > ${WRKSRC}/etqwded
 
 do-install:
@@ -64,7 +64,7 @@ do-install:
 
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILE in EULA.txt README.txt copyrights.txt etqwtv.txt pb/PBEULA.txt
+.for FILE in EULA.txt README.txt copyrights.txt etqwtv.txt readme_1_5_patch.txt server_readme.txt pb/PBEULA.txt
 	@${INSTALL_DATA} ${WRKSRC}/data/${FILE} ${DOCSDIR}
 .endfor
 .endif
diff --git a/games/linux-etqw-server/distinfo b/games/linux-etqw-server/distinfo
index c2ce015aca37..22f1221fb028 100644
--- a/games/linux-etqw-server/distinfo
+++ b/games/linux-etqw-server/distinfo
@@ -1,6 +1,3 @@
-MD5 (ETQW-server-1.4-full.x86.run) = c978b56a488bfbef5ac0ed8ac9489c92
-SHA256 (ETQW-server-1.4-full.x86.run) = a024a506969c8c7b9cb44535a7d1b43240a42ee46647fc37f9bf07e6d2e22720
-SIZE (ETQW-server-1.4-full.x86.run) = 447497032
-MD5 (ETQW-server-1.4-hotfix.r1.zip) = 20cd770bed61b95be66c7844b9b9f6a3
-SHA256 (ETQW-server-1.4-hotfix.r1.zip) = 9667ba216ceefbf324bf9e7851749f1760ae95e3cd47d77c346adb8e6b0653b0
-SIZE (ETQW-server-1.4-hotfix.r1.zip) = 5186561
+MD5 (ETQW-server-1.5-full.x86.run) = b09cfc1fc0675a5e9070fe34d452e9b8
+SHA256 (ETQW-server-1.5-full.x86.run) = 7dc4cf69b3355063b4f8767e23b19d8224ff9b4f556ad906056063ddfe581ac0
+SIZE (ETQW-server-1.5-full.x86.run) = 452679053
diff --git a/games/linux-etqw-server/pkg-plist b/games/linux-etqw-server/pkg-plist
index 3323830d18d9..9b13afdd77b0 100644
--- a/games/linux-etqw-server/pkg-plist
+++ b/games/linux-etqw-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/etqwded
 lib/etqw-server/base/bots/botnames.dat
 lib/etqw-server/base/game000.pk4
+lib/etqw-server/base/game001.pk4
 lib/etqw-server/base/game002.pk4
 lib/etqw-server/base/match.cfg
 lib/etqw-server/base/pak000.pk4
@@ -11,8 +12,8 @@ lib/etqw-server/base/pak004.pk4
 lib/etqw-server/base/pak005.pk4
 lib/etqw-server/base/pak006.pk4
 lib/etqw-server/base/pak007.pk4
+lib/etqw-server/base/pak008.pk4
 lib/etqw-server/base/public.cfg
-lib/etqw-server/base/server.cfg
 lib/etqw-server/base/usergroups.dat
 lib/etqw-server/base/usergroups.example
 lib/etqw-server/etqwded.x86
@@ -37,6 +38,8 @@ lib/etqw-server/pb/pbsv.so
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/copyrights.txt
 %%PORTDOCS%%%%DOCSDIR%%/etqwtv.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme_1_5_patch.txt
+%%PORTDOCS%%%%DOCSDIR%%/server_readme.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/etqw-server/pb/htm
 @dirrm lib/etqw-server/pb