diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index a13fd364c8d6..e95e665f6c7c 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -1,61 +1,75 @@
 # New ports collection makefile for:	linux-doom3
 # Date created:				7 May 2006
 # Whom:					alepulver
 #
 # $FreeBSD$
 #
 
 PORTNAME=	doom3
 PORTVERSION=	1.3.1302
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
 MASTER_SITE_SUBDIR=	doom3/linux
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}.x86
 EXTRACT_SUFX=	.run
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Doom III for Linux
 
 ONLY_FOR_ARCHS=	i386
 USE_XLIB=	yes
 USE_LINUX=	yes
+NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 OPTIONS=	NO_CDKEY "Use older version which doesn't require cd key" off
 
 DATADIR=	${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
 SUB_FILES=	doom3 doom3-ded pkg-message
 
 .include <bsd.port.pre.mk>
 
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
+.if defined(WITH_NVIDIA_GL)
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.else
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
+.endif
+.else
+RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
+.endif
+
 .if defined(WITH_NO_CDKEY)
 PORTVERSION=	1.1.1286
 MASTER_SITE_SUBDIR=	doom3/linux/old
 PLIST_SUB+=	NEW="@comment "
 .else
 PLIST_SUB+=	NEW=""
 .endif
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} && ${TAIL} +374 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
 do-install:
 	${MKDIR} ${DATADIR}/base
 	cd ${WRKSRC}/base && \
 		${INSTALL_DATA} game01.pk4 pak*.pk4 ${DATADIR}/base
 	cd ${WRKSRC}/bin/Linux/x86 && \
 		${INSTALL_PROGRAM} doom.x86 doomded.x86 ${DATADIR}
 	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/doom3.png ${PREFIX}/share/pixmaps
-	${INSTALL_PROGRAM} ${WRKDIR}/doom3 ${WRKDIR}/doom3-ded ${PREFIX}/bin
+.for f in doom3 doom3-ded
+	${INSTALL_PROGRAM} ${WRKDIR}/${f} ${PREFIX}/bin/${PKGNAMEPREFIX}${f}
+.endfor
 
 post-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/games/linux-doom3/pkg-plist b/games/linux-doom3/pkg-plist
index 58271643fc17..6857eba1fcdf 100644
--- a/games/linux-doom3/pkg-plist
+++ b/games/linux-doom3/pkg-plist
@@ -1,12 +1,12 @@
-bin/doom3
-bin/doom3-ded
+bin/linux-doom3
+bin/linux-doom3-ded
 %%DATADIR%%/base/game01.pk4
 %%DATADIR%%/base/pak005.pk4
 %%NEW%%%%DATADIR%%/base/pak006.pk4
 %%NEW%%%%DATADIR%%/base/pak007.pk4
 %%DATADIR%%/doom.x86
 %%DATADIR%%/doomded.x86
 share/pixmaps/doom3.png
 @dirrmtry share/pixmaps
 @dirrmtry %%DATADIR%%/base
 @unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt