diff --git a/games/sampsvr/Makefile b/games/sampsvr/Makefile
index 763809f8ec8c..f81015f946ab 100644
--- a/games/sampsvr/Makefile
+++ b/games/sampsvr/Makefile
@@ -1,67 +1,68 @@
 # New ports collection makefile for:	sampsvr
 # Date created:				6 November 2006
 # Whom:					Alexander Logvinov <ports@logvinov.com>
 #
 # $FreeBSD$
 
 PORTNAME=	sampsvr
-PORTVERSION=	0.2.1
+DISTVERSION=	0.2.1.2
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.sa-mp.com/files/ \
 		http://eu.littlewhitey.com/ \
-		http://dedi.azer.nl/upload/
-DISTNAME=	samp021svr
+		http://dedi.azer.nl/upload/ \
+		http://www.kfcgang.com/files/
+DISTNAME=	samp021r2.svr
 
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Rockstar's GTA: San Andreas multiplayer modification dedicated server
 
 USE_LINUX=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/samp02
 USE_DOS2UNIX=	server.cfg *.pwn
 USE_RC_SUBR=	sampd
 SAMPDIR=	${PREFIX}/lib/${PORTNAME}
 PORTDOCS=	README
 PLIST_SUB=	SAMPDIR="${SAMPDIR:S,^${PREFIX}/,,}"
 SUB_FILES=	pkg-message
 SUB_LIST=	SAMPDIR="${SAMPDIR}"
 .if !defined(NOPORTDOCS)
 SUB_LIST+=	NOTEWORK="Read ${DOCSDIR}/README to configure SA-MP Server"
 .else
 SUB_LIST+=	NOTEWORK=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 do-install:
 	${MKDIR} ${SAMPDIR}
 .for i in samp02svr announce
 	${BRANDELF} -t Linux ${WRKSRC}/${i}
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${SAMPDIR}
 .endfor
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && \
 	${FIND} . -type d ! -empty -exec \
 		${MKDIR} "${DATADIR}/{}" \; && \
 	${FIND} filterscripts -type f -exec \
 		${INSTALL_DATA} "{}" "${DATADIR}/{}" \; && \
 	${FIND} gamemodes -type f -exec \
 		${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 	${LN} -sf ${DATADIR}/filterscripts/ ${SAMPDIR}/filterscripts
 	${LN} -sf ${DATADIR}/gamemodes/ ${SAMPDIR}/gamemodes
 .if !exists(${PREFIX}/etc/${PORTNAME}.cfg)
 	${INSTALL_DATA} ${WRKSRC}/server.cfg ${PREFIX}/etc/${PORTNAME}.cfg
 .endif
 	${INSTALL_DATA} ${WRKSRC}/server.cfg ${PREFIX}/etc/${PORTNAME}.cfg.dist
 	${LN} -sf ${PREFIX}/etc/${PORTNAME}.cfg ${SAMPDIR}/server.cfg
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/games/sampsvr/distinfo b/games/sampsvr/distinfo
index 53f2deecb178..e7bc5a7fae57 100644
--- a/games/sampsvr/distinfo
+++ b/games/sampsvr/distinfo
@@ -1,3 +1,3 @@
-MD5 (samp021svr.tar.gz) = 77c1a1b6efd0d4ebc27f2e28c77ac062
-SHA256 (samp021svr.tar.gz) = c072051b70e8cd16d8abd5f3bbac615a003ea4b9d12bdffc33a287607c8483fb
-SIZE (samp021svr.tar.gz) = 358237
+MD5 (samp021r2.svr.tar.gz) = fcc54c2fed50738f8a48e602f7922503
+SHA256 (samp021r2.svr.tar.gz) = 70e5ae5dfea5837b4e42d83d3a00811f48cbc26daf20bb87ddde4a4f73ed659b
+SIZE (samp021r2.svr.tar.gz) = 361617
diff --git a/games/sampsvr/files/sampd.in b/games/sampsvr/files/sampd.in
index dd4aab6afe21..adba228e400a 100644
--- a/games/sampsvr/files/sampd.in
+++ b/games/sampsvr/files/sampd.in
@@ -1,39 +1,39 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: sampd
 # REQUIRE: NETWORKING
 #
 # Add the following line to /etc/rc.conf[.local] to enable sampd
 #
 # sampd_enable (bool):		Set to "NO" by default.
 #                               Set it to "YES" to enable sampd.
 
 . %%RC_SUBR%%
 
 name="sampd"
 rcvar=${name}_enable
 
 load_rc_config $name
 
 : ${sampd_enable="NO"}
 : ${sampd_chdir="%%SAMPDIR%%"}
 
 command="%%SAMPDIR%%/samp02svr"
-command_args="&"
+command_args="> /dev/null &"
 required_files="%%PREFIX%%/etc/sampsvr.cfg"
 start_precmd="sampd_prestart"
 stop_precmd="sampd_prestop"
 
 sampd_prestart() {
     if ! kldstat -v | grep -E 'linux(aout|elf)' > /dev/null; then
 	err 1 "Linux support required"
     fi
 }
 		
 sampd_prestop() {
     rc_pid=`echo $rc_pid | awk '{print $1}'`
 }
 		    
 run_rc_command "$1"