diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 9701deb22da..7be33d4f618 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,13 +1,18 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/02/01 06:18:24 jolan Exp $
+# $OpenBSD: Makefile,v 1.2 2004/09/30 01:34:52 jolan Exp $
 
 COMMENT=	"collection of various tools for scummvm"
-DISTNAME=	scummvm-tools-0.5.0
+# this tarball is horribly packaged
+VERSION=	0.6.1
+DISTNAME=	scummvm-tools-${VERSION}-src
+PKGNAME=	${DISTNAME:S/-src//}
+WRKDIST=	${WRKDIR}/scummvm-${VERSION}-tools
+EXTRACT_SUFX=   .tar.bz2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 
 HOMEPAGE=	http://scummvm.sourceforge.net/
 
-MAINTAINER=	Jolan Luff <jolan@openbsd.org>
+MAINTAINER=	Jonathan Gray <jsg@goblin.cx>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -25,13 +30,20 @@ CXXFLAGS+=	-DSCUMM_BIG_ENDIAN
 .endif
 
 RUN_DEPENDS=	::audio/lame \
-		::audio/vorbis-tools
+		::audio/vorbis-tools \
+		::audio/flac
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm-tools
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools	
-	${INSTALL_PROGRAM} ${WRKBUILD}/descumm{,6} ${WRKBUILD}/extract \
-		${WRKBUILD}/rescumm ${WRKBUILD}/simon{1decr,2mp3} \
+	${INSTALL_PROGRAM} \
+		${WRKBUILD}/descumm \
+		${WRKBUILD}/extract \
+		${WRKBUILD}/simon{1decr,2mp3} \
+		${WRKBUILD}/desword2 \
+		${WRKBUILD}/rescumm \
+		${WRKBUILD}/compress_san \
+		${WRKBUILD}/convbdf \
 		${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo
index a03f79bae11..36686be8a28 100644
--- a/games/scummvm-tools/distinfo
+++ b/games/scummvm-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (scummvm-tools-0.5.0.tar.gz) = e5bc5b252c9d3d7176a1b9e5bbad3335
-RMD160 (scummvm-tools-0.5.0.tar.gz) = cd0e0825cf2e8633edf5592a96dac49a6e389c38
-SHA1 (scummvm-tools-0.5.0.tar.gz) = a6667ccd4ec4e4b982ad5607f0ca8e24aaa23325
+MD5 (scummvm-tools-0.6.1-src.tar.bz2) = b2ba0801fbd85a568af1c5af14fd18ac
+RMD160 (scummvm-tools-0.6.1-src.tar.bz2) = 4a80147836e93a04a913bed0837a4f1f130e89b3
+SHA1 (scummvm-tools-0.6.1-src.tar.bz2) = e05ad88cf43073ac39053a5e07a83ef39d5b41d7
diff --git a/games/scummvm-tools/patches/patch-Makefile b/games/scummvm-tools/patches/patch-Makefile
index 8e10a909a95..b41e54d21be 100644
--- a/games/scummvm-tools/patches/patch-Makefile
+++ b/games/scummvm-tools/patches/patch-Makefile
@@ -1,35 +1,61 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2004/02/01 06:18:24 jolan Exp $
---- Makefile.orig	2003-05-21 00:13:22.000000000 -0500
-+++ Makefile	2004-01-31 20:16:09.000000000 -0600
-@@ -1,8 +1,9 @@
+$OpenBSD: patch-Makefile,v 1.2 2004/09/30 01:34:52 jolan Exp $
+--- Makefile.orig	Sun Jul 11 14:56:58 2004
++++ Makefile	Tue Sep 28 00:41:04 2004
+@@ -1,9 +1,10 @@
  SRC=.
  
 -CC      := gcc
 -CXX     := g++
--CFLAGS  := -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
+-CFLAGS  := -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar
+-LDFLAGS :=
 +#CC      := gcc
 +#CXX     := g++
-+CFLAGS+= -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
-+CXXFLAGS+= -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
- LDFLAGS :=
++CFLAGS  += -Wall -Wuninitialized -Wno-long-long -Wno-multichar
++CXXFLAGS += -Wall -Wuninitialized -Wno-long-long -Wno-multichar
++# LDFLAGS :=
  
- # Uncomment this if you are on a big endian system
-@@ -19,22 +20,22 @@ TARGETS := \
+ # Additional warnings
+ CFLAGS+= -Wshadow
+@@ -32,40 +33,40 @@ TARGETS := \
  all: $(TARGETS)
  
- descumm$(EXEEXT): descumm.o descumm-common.o
+ compress_san$(EXEEXT): compress_san.o util.o
+-	$(CXX) $(LFLAGS) -o $@ $+ -lz
++	$(CXX) $(LDFLAGS) -o $@ $+ -lz
+ 
+ convbdf$(EXEEXT): convbdf.o util.o
 -	$(CXX) $(LFLAGS) -o $@ $+
 +	$(CXX) $(LDFLAGS) -o $@ $+
  
- descumm6$(EXEEXT): descumm6.o descumm-common.o
+ descumm$(EXEEXT): descumm-tool.o descumm.o descumm6.o descumm-common.o util.o
 -	$(CXX) $(LFLAGS) -o $@ $+
 +	$(CXX) $(LDFLAGS) -o $@ $+
  
- extract$(EXEEXT): extract.o
+ desword2$(EXEEXT): desword2.o util.o
+-	$(CXX) $(LFLAGS) -o $@ $+
++	$(CXX) $(LDFLAGS) -o $@ $+
+ 
+ extract$(EXEEXT): extract.o extract-common.o util.o
 -	$(CC) $(LFLAGS) -o $@ $+
 +	$(CC) $(LDFLAGS) -o $@ $+
  
- rescumm$(EXEEXT): rescumm.o
+ loom_tg16_extract$(EXEEXT): loom_tg16_extract.o
+-	$(CC) $(LFLAGS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+
+ 
+ md5table$(EXEEXT): md5table.o util.o
+-	$(CXX) $(LFLAGS) -o $@ $+
++	$(CXX) $(LDFLAGS) -o $@ $+
+ 
+ mm_nes_extract$(EXEEXT): mm_nes_extract.o
+-	$(CC) $(LFLAGS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+
+ 
+ queenrebuild$(EXEEXT): queenrebuild.o util.o
+-	$(CC) $(LFLAGS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+
+ 
+ rescumm$(EXEEXT): rescumm.o util.o
 -	$(CC) $(LFLAGS) -o $@ $+
 +	$(CC) $(LDFLAGS) -o $@ $+
  
@@ -37,13 +63,13 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/02/01 06:18:24 jolan Exp $
 -	$(CC) $(LFLAGS) -o $@ $+
 +	$(CC) $(LDFLAGS) -o $@ $+
  
- simon2mp3$(EXEEXT): simon2mp3.o
+ simon2mp3$(EXEEXT): simon2mp3.o extract-common.o util.o
 -	$(CC) $(LFLAGS) -o $@ $+
 +	$(CC) $(LDFLAGS) -o $@ $+
  
  
- descumm.o descumm6.o descumm-common.o: descumm.h
-@@ -43,7 +44,7 @@ clean:
+ descumm.o descumm6.o descumm-common.o descumm-tool.o: descumm.h util.h
+@@ -76,7 +77,7 @@ clean:
  	rm -f *.o $(TARGETS)
  
  .cpp.o:
diff --git a/games/scummvm-tools/patches/patch-simon1decr_c b/games/scummvm-tools/patches/patch-simon1decr_c
index cea9c3a91d6..5504fc56d31 100644
--- a/games/scummvm-tools/patches/patch-simon1decr_c
+++ b/games/scummvm-tools/patches/patch-simon1decr_c
@@ -1,21 +1,20 @@
-$OpenBSD: patch-simon1decr_c,v 1.1.1.1 2004/02/01 06:18:24 jolan Exp $
---- simon1decr.c.orig	2003-05-22 00:36:05.000000000 -0500
-+++ simon1decr.c	2004-01-30 19:14:15.000000000 -0600
-@@ -26,14 +26,9 @@ typedef unsigned char UBYTE;
- 
- #define EndGetM32(a)  ((((a)[0])<<24)|(((a)[1])<<16)|(((a)[2])<<8)|((a)[3]))
- 
--#define SD_GETBIT(var) do { \
--  if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } \
--  (var) = bb & 1; bb >>= 1; \
--} while (0)
--
--#define SD_GETBITS(var, nbits) do { \
--  bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } \
--} while (0)
-+#define SD_GETBIT(var) do { if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } (var) = bb & 1; bb >>= 1; } while (0)
-+
-+#define SD_GETBITS(var, nbits) do { bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } } while (0)
- 
- #define SD_TYPE_LITERAL (0)
- #define SD_TYPE_MATCH   (1)
+$OpenBSD: patch-simon1decr_c,v 1.2 2004/09/30 01:34:52 jolan Exp $
+--- simon1decr.c.orig	Mon Apr 12 08:10:19 2004
++++ simon1decr.c	Tue Sep 28 00:48:41 2004
+@@ -26,14 +26,9 @@ typedef unsigned char UBYTE;
+ 
+ #define EndGetM32(a)  ((((a)[0])<<24)|(((a)[1])<<16)|(((a)[2])<<8)|((a)[3]))
+ 
+-#define SD_GETBIT(var) do { \
+-  if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } \
+-  (var) = bb & 1; bb >>= 1; \
+-} while (0)
++#define SD_GETBIT(var) do { if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } (var) = bb & 1; bb >>= 1; } while (0)
+ 
+-#define SD_GETBITS(var, nbits) do { \
+-  bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } \
+-} while (0)
++#define SD_GETBITS(var, nbits) do { bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } } while (0)
+ 
+ #define SD_TYPE_LITERAL (0)
+ #define SD_TYPE_MATCH   (1)
diff --git a/games/scummvm-tools/pkg/PLIST b/games/scummvm-tools/pkg/PLIST
index a66f6f9543d..9c63127bc8d 100644
--- a/games/scummvm-tools/pkg/PLIST
+++ b/games/scummvm-tools/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:46:10 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/09/30 01:34:53 jolan Exp $
+bin/compress_san
+bin/convbdf
 bin/descumm
-bin/descumm6
+bin/desword2
 bin/extract
 bin/rescumm
 bin/simon1decr