diff --git a/emulators/scummvm/Makefile b/emulators/scummvm/Makefile
index 8db7e5bf9b0a..64097f27d4a1 100644
--- a/emulators/scummvm/Makefile
+++ b/emulators/scummvm/Makefile
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	scummvm
-PORTVERSION=	0.3.0b
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
-MAINTAINER=	flynn@energyhq.homeip.net
+MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		mad.1:${PORTSDIR}/audio/mad
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=         ${WRKDIR}/${PORTNAME}-0.3.0
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
diff --git a/emulators/scummvm/distinfo b/emulators/scummvm/distinfo
index feefca9758c4..1a3d8de14945 100644
--- a/emulators/scummvm/distinfo
+++ b/emulators/scummvm/distinfo
@@ -1 +1 @@
-MD5 (scummvm_0.3.0b-src.tar.gz) = 2192a22fb40f7c63c4f6f862ad60897c
+MD5 (scummvm-0.4.0.tar.bz2) = 590bd433171489cb874bbd686b296fe1
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 8db7e5bf9b0a..64097f27d4a1 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	scummvm
-PORTVERSION=	0.3.0b
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
-MAINTAINER=	flynn@energyhq.homeip.net
+MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		mad.1:${PORTSDIR}/audio/mad
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=         ${WRKDIR}/${PORTNAME}-0.3.0
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index feefca9758c4..1a3d8de14945 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1 +1 @@
-MD5 (scummvm_0.3.0b-src.tar.gz) = 2192a22fb40f7c63c4f6f862ad60897c
+MD5 (scummvm-0.4.0.tar.bz2) = 590bd433171489cb874bbd686b296fe1