diff --git a/games/sdlsand/Makefile b/games/sdlsand/Makefile
index 891e55f72d82..2e5293b73e84 100644
--- a/games/sdlsand/Makefile
+++ b/games/sdlsand/Makefile
@@ -1,40 +1,41 @@
 # New ports collection makefile for:	sdlsand
 # Date created:		22 Apr 2006
 # Whom:			Dmitry Marakasov <amdmi3@mail.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sdlsand
-PORTVERSION=	20060207
-PORTREVISION=	2
+PORTVERSION=	20061017
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	sldsand-src-${PORTVERSION}
 
 MAINTAINER=	amdmi3@mail.ru
 COMMENT=	Simulation of falling sand and other materials
 
 USE_ZIP=	yes
 USE_SDL=	sdl
 USE_X_PREFIX=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/SDL\ Sand/SDL\ Sand
+WRKSRC=		${WRKDIR}/SDL\ Sand/SDL\ Sand
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	readme.txt
 
+post-patch:
+	@${REINPLACE_CMD} -e '/crtdbg/ d' ${WRKSRC}/CmdLine.cpp
+
 do-build:
 	cd ${WRKSRC} && ${CXX} -o ${PORTNAME} ${CXXFLAGS} \
-		`${SDL_CONFIG} --cflags --libs` main.cpp
+		`${SDL_CONFIG} --cflags --libs` main.cpp CmdLine.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/sdlsand/distinfo b/games/sdlsand/distinfo
index 99649553a92d..e3ca25053d4f 100644
--- a/games/sdlsand/distinfo
+++ b/games/sdlsand/distinfo
@@ -1,3 +1,3 @@
-MD5 (sldsand-src-20060207.zip) = c2611a17ad7665bcbfb28352dc95434e
-SHA256 (sldsand-src-20060207.zip) = cab31d00789115fbd13a57b29a5a4e6752e3f70b718d168389785cdda8d649d5
-SIZE (sldsand-src-20060207.zip) = 552046
+MD5 (sdlsand-20061017.zip) = b1b29d80d4b8e70d2ae1adb3ebec066d
+SHA256 (sdlsand-20061017.zip) = ab29d5bbaaafba5a9fc23f8fbe3840db44624e8a77b62fed975c50cf2e93bc60
+SIZE (sdlsand-20061017.zip) = 883605