diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 3f317847a61d..691ef1a11d58 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -10,6 +10,10 @@ PORTVERSION=	0.1.1
 CATEGORIES=	games
 MASTER_SITES=	http://download.sourceforge.net/quake/
 DISTNAME=	quakeforge-${PORTVERSION}
+.if !defined(NO_WAD)
+MASTER_SITES+=	http://www.devolution.com/~slouken/SDL/projects/quake/data/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${WADFILE}
+.endif
 
 MAINTAINER=	darius@dons.net.au
 
@@ -17,6 +21,7 @@ BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl \
 		${GL_DEPENDS}
 
+WADFILE=        quakesw-1.0.6.tar.gz
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
@@ -37,19 +42,41 @@ BINARIES+=      quake-gl qw-client-gl
 GL_DEPENDS=
 CONFIGURE_ARGS+=--without-opengl
 .endif
+.if !defined(NO_WAD)
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+BINDIR=		${PREFIX}/share/quakeforge
+.else
+BINDIR=		${PREFIX}/bin
+.endif
 
 pre-configure:
-	@${CP} ${PKGDIR}/PLIST ${PLIST}
-.if defined(USE_GLX)
-	${CAT} ${PKGDIR}/PLIST.glx >>${PLIST}
-.else
+.if !defined(USE_GLX)
 	@${ECHO_MSG} "Define USE_GLX to use GLX (otherwise it is explicitly disabled!)"
 .endif
 
 do-install:
+	@${CP} ${PKGDIR}/PLIST ${PLIST}
+
+.if defined(USE_GLX)
+	@${CAT} ${PKGDIR}/PLIST.glx >>${PLIST}
+.endif
+
+.if !defined(NO_WAD)
+	${MKDIR} ${PREFIX}/share/quakeforge
+	${TAR} xfz ${DISTDIR}/${WADFILE} -C ${PREFIX}/share/quakeforge
 .for binary in ${BINARIES}
-	${INSTALL_PROGRAM} ${WRKSRC}/targets/${binary} ${PREFIX}/bin/
+	@printf "#!/bin/sh\ncd ${PREFIX}/share/quakeforge\n./${binary} \$$@" > \
+		${WRKDIR}/${binary}.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/${binary}.sh ${PREFIX}/bin/${binary}
+	@${ECHO} share/quakeforge/${binary} >>${PLIST}
 .endfor
+	@${CAT} ${PKGDIR}/PLIST.wad >>${PLIST}
+.endif
+
+.for binary in ${BINARIES}
+	${INSTALL_PROGRAM} ${WRKSRC}/targets/${binary} ${BINDIR}/
+.endfor
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/quakeforge
 	cd ${WRKSRC}/doc && \
diff --git a/games/quakeforge/distinfo b/games/quakeforge/distinfo
index 7a065a2d0d3b..9ff00722a5a9 100644
--- a/games/quakeforge/distinfo
+++ b/games/quakeforge/distinfo
@@ -1 +1,2 @@
 MD5 (quakeforge-0.1.1.tar.bz2) = 7cf29a1a21e5c736bf0cb148417ef337
+MD5 (quakesw-1.0.6.tar.gz) = 663b749612d55de29f74966ec3168918
diff --git a/games/quakeforge/pkg-plist.wad b/games/quakeforge/pkg-plist.wad
new file mode 100644
index 000000000000..e3c784ace4f2
--- /dev/null
+++ b/games/quakeforge/pkg-plist.wad
@@ -0,0 +1,3 @@
+share/quakeforge/id1/pak0.pak
+@dirrm share/quakeforge/id1
+@dirrm share/quakeforge