diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index b0ed2524de1..3d172ca9bce 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2010/07/13 21:23:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.37 2010/10/17 19:59:51 jsg Exp $
 
 BROKEN-hppa=	gcc bug
 
 COMMENT=	graphical adventure game interpreter
-DISTNAME=	scummvm-1.1.1
+DISTNAME=	scummvm-1.2.0
 CATEGORIES=	games x11 emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 
@@ -28,7 +28,7 @@ LIB_DEPENDS=	SDL::devel/sdl \
 		FLAC.>=5::audio/flac
 
 CONFIGURE_STYLE=simple
-CONFIGURE_ARGS+=--disable-alsa --disable-debug --enable-sci
+CONFIGURE_ARGS+=--disable-alsa --disable-debug
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -57,8 +57,6 @@ CXXFLAGS+=	-O0
 CXXFLAGS+=	-O1
 .endif
 
-CXXFLAGS+=	-fno-stack-protector
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm
 	${INSTALL_DATA_DIR} ${PREFIX}/share/icons
@@ -70,6 +68,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/dists/scummvm.6 ${PREFIX}/man/man6
 	${INSTALL_DATA} ${WRKSRC}/gui/themes/{scummmodern,scummclassic}.zip \
 	    ${PREFIX}/share/scummvm
+	${INSTALL_DATA} ${WRKSRC}/gui/themes/translations.dat \
+	    ${PREFIX}/share/scummvm
 	${INSTALL_DATA} ${WRKSRC}/dists/scummvm.desktop \
 	    ${PREFIX}/share/applications
 	${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 04aa360ed36..34f065b4103 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,5 +1,5 @@
-MD5 (scummvm-1.1.1.tar.gz) = //omalIQZtDKjYmSPYRvDw==
-RMD160 (scummvm-1.1.1.tar.gz) = 3eUuZKmMSiOACM83Ist1YwI5ugY=
-SHA1 (scummvm-1.1.1.tar.gz) = sIxi09QiwtKViA6ge9usyh4Lhuo=
-SHA256 (scummvm-1.1.1.tar.gz) = umXscE7dUEUYWKukoHk4qoYp564Ur1F7mgJPaLoYRpc=
-SIZE (scummvm-1.1.1.tar.gz) = 10310047
+MD5 (scummvm-1.2.0.tar.gz) = cRnzROB9IwcJIF/1/J1Bxw==
+RMD160 (scummvm-1.2.0.tar.gz) = 0+NRQpwD0JDNq/rCll5b67X8UrM=
+SHA1 (scummvm-1.2.0.tar.gz) = Pq23wpO2VrH6ojJFfCwxETu4KTE=
+SHA256 (scummvm-1.2.0.tar.gz) = HGzSeRGEyaFlCHTHzF8SfFo07YqwTFfatWdh4ZVfqS4=
+SIZE (scummvm-1.2.0.tar.gz) = 11329774
diff --git a/games/scummvm/patches/patch-Makefile_common b/games/scummvm/patches/patch-Makefile_common
index f054c27e74d..4c06f3dfea5 100644
--- a/games/scummvm/patches/patch-Makefile_common
+++ b/games/scummvm/patches/patch-Makefile_common
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_common,v 1.3 2010/07/13 21:23:39 jsg Exp $
---- Makefile.common.orig	Mon Jul 12 22:02:10 2010
-+++ Makefile.common	Mon Jul 12 22:03:00 2010
-@@ -164,28 +164,6 @@ VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
+$OpenBSD: patch-Makefile_common,v 1.4 2010/10/17 19:59:51 jsg Exp $
+--- Makefile.common.orig	Sun Oct 17 15:47:53 2010
++++ Makefile.common	Sun Oct 17 15:48:25 2010
+@@ -156,27 +156,6 @@ VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
  VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
  VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
  
@@ -10,9 +10,9 @@ $OpenBSD: patch-Makefile_common,v 1.3 2010/07/13 21:23:39 jsg Exp $
 -# Get Subversion's working copy information
 -######################################################################
 -
--ifeq ($(shell LANG=C svn stat $(srcdir) 2>&1 | grep "is not a working copy"),)
+-ifneq ($(shell svn info $(srcdir) 1>/dev/null 2>&1 || echo "error"),error)
 -SVNROOT := $(srcdir)
--ifeq ($(origin SVNREV), undefined)
+-ifeq ($(origin VER_SVNREV), undefined)
 -# Get the working copy base revision
 -VER_SVNREV := $(shell LANG=C svn info $(SVNROOT) | grep "^Revision" | cut -d ' ' -f 2)
 -endif
@@ -21,11 +21,10 @@ $OpenBSD: patch-Makefile_common,v 1.3 2010/07/13 21:23:39 jsg Exp $
 -endif
 -
 -# Define the Subversion revision if available, either autodetected or
--# specified by the user
+-# specified by the user, but only for base/version.cpp.
 -ifneq ($(origin VER_SVNREV), undefined)
--CXXFLAGS+= -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
+-base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
 -endif
--
 -
  ######################################################################
  # Distribution settings
diff --git a/games/scummvm/patches/patch-common_hashmap_h b/games/scummvm/patches/patch-common_hashmap_h
deleted file mode 100644
index 126aeb488f0..00000000000
--- a/games/scummvm/patches/patch-common_hashmap_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-common_hashmap_h,v 1.3 2010/07/13 21:23:39 jsg Exp $
---- common/hashmap.h.orig	Mon Jan 25 02:39:44 2010
-+++ common/hashmap.h	Mon Jul 12 21:58:22 2010
-@@ -68,10 +68,7 @@ template<class T> class IteratorImpl;
- template<class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> >
- class HashMap {
- private:
--#if defined (PALMOS_MODE)
- public:
--#endif
--
- 	typedef HashMap<Key, Val, HashFunc, EqualFunc> HM_t;
- 
- 	struct Node {
diff --git a/games/scummvm/patches/patch-configure b/games/scummvm/patches/patch-configure
index a1709aff42b..be19be275fc 100644
--- a/games/scummvm/patches/patch-configure
+++ b/games/scummvm/patches/patch-configure
@@ -1,9 +1,9 @@
-$OpenBSD: patch-configure,v 1.5 2010/07/13 21:23:39 jsg Exp $
---- configure.orig	Thu Apr  1 00:51:54 2010
-+++ configure	Mon Jul 12 21:58:22 2010
-@@ -1949,9 +1949,11 @@ fi
+$OpenBSD: patch-configure,v 1.6 2010/10/17 19:59:51 jsg Exp $
+--- configure.orig	Thu Oct  7 17:48:52 2010
++++ configure	Sun Oct 17 15:45:59 2010
+@@ -2278,9 +2278,11 @@ EOF
+ fi
  if test "$_flac" = yes ; then
- 	_def_flac='#define USE_FLAC'
  	if test "$_vorbis" = yes ; then
 -		LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
 +		# LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
@@ -14,4 +14,4 @@ $OpenBSD: patch-configure,v 1.5 2010/07/13 21:23:39 jsg Exp $
 +		LIBS="$LIBS `pkg-config --libs flac`"
  	fi
  	INCLUDES="$INCLUDES $FLAC_CFLAGS"
- else
+ fi
diff --git a/games/scummvm/pkg/PLIST b/games/scummvm/pkg/PLIST
index 7dcd499bc61..19eeeae339b 100644
--- a/games/scummvm/pkg/PLIST
+++ b/games/scummvm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/12/22 16:28:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2010/10/17 19:59:51 jsg Exp $
 @bin bin/scummvm
 @man man/man6/scummvm.6
 share/applications/
@@ -15,3 +15,4 @@ share/scummvm/scummclassic.zip
 share/scummvm/scummmodern.zip
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
+share/scummvm/translations.dat