diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
new file mode 100644
index 00000000000..9701deb22da
--- /dev/null
+++ b/games/scummvm-tools/Makefile
@@ -0,0 +1,37 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2004/02/01 06:18:24 jolan Exp $
+
+COMMENT=	"collection of various tools for scummvm"
+DISTNAME=	scummvm-tools-0.5.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
+
+HOMEPAGE=	http://scummvm.sourceforge.net/
+
+MAINTAINER=	Jolan Luff <jolan@openbsd.org>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+NO_REGRESS=	Yes
+USE_GMAKE=	Yes
+
+.if (!${MACHINE_ARCH} == "alpha" && !${MACHINE_ARCH} == "i386" && \
+     !${MACHINE_ARCH} == "vax")
+CFLAGS+=	-DSCUMM_BIG_ENDIAN
+CXXFLAGS+=	-DSCUMM_BIG_ENDIAN
+.endif
+
+RUN_DEPENDS=	::audio/lame \
+		::audio/vorbis-tools
+
+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} \
+		${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo
new file mode 100644
index 00000000000..a03f79bae11
--- /dev/null
+++ b/games/scummvm-tools/distinfo
@@ -0,0 +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
diff --git a/games/scummvm-tools/patches/patch-Makefile b/games/scummvm-tools/patches/patch-Makefile
new file mode 100644
index 00000000000..8e10a909a95
--- /dev/null
+++ b/games/scummvm-tools/patches/patch-Makefile
@@ -0,0 +1,54 @@
+$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 @@
+ SRC=.
+ 
+-CC      := gcc
+-CXX     := g++
+-CFLAGS  := -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
++#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 :=
+ 
+ # Uncomment this if you are on a big endian system
+@@ -19,22 +20,22 @@ TARGETS := \
+ all: $(TARGETS)
+ 
+ descumm$(EXEEXT): descumm.o descumm-common.o
+-	$(CXX) $(LFLAGS) -o $@ $+
++	$(CXX) $(LDFLAGS) -o $@ $+
+ 
+ descumm6$(EXEEXT): descumm6.o descumm-common.o
+-	$(CXX) $(LFLAGS) -o $@ $+
++	$(CXX) $(LDFLAGS) -o $@ $+
+ 
+ extract$(EXEEXT): extract.o
+-	$(CC) $(LFLAGS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+
+ 
+ rescumm$(EXEEXT): rescumm.o
+-	$(CC) $(LFLAGS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+
+ 
+ simon1decr$(EXEEXT): simon1decr.o
+-	$(CC) $(LFLAGS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+
+ 
+ simon2mp3$(EXEEXT): simon2mp3.o
+-	$(CC) $(LFLAGS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+
+ 
+ 
+ descumm.o descumm6.o descumm-common.o: descumm.h
+@@ -43,7 +44,7 @@ clean:
+ 	rm -f *.o $(TARGETS)
+ 
+ .cpp.o:
+-	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
diff --git a/games/scummvm-tools/patches/patch-simon1decr_c b/games/scummvm-tools/patches/patch-simon1decr_c
new file mode 100644
index 00000000000..cea9c3a91d6
--- /dev/null
+++ b/games/scummvm-tools/patches/patch-simon1decr_c
@@ -0,0 +1,21 @@
+$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)
diff --git a/games/scummvm-tools/pkg/DESCR b/games/scummvm-tools/pkg/DESCR
new file mode 100644
index 00000000000..e734ffe0f77
--- /dev/null
+++ b/games/scummvm-tools/pkg/DESCR
@@ -0,0 +1,2 @@
+scummvm-tools is a collection of various tools that may be useful to use
+in conjunction with ScummVM.
diff --git a/games/scummvm-tools/pkg/PLIST b/games/scummvm-tools/pkg/PLIST
new file mode 100644
index 00000000000..28ed58fd666
--- /dev/null
+++ b/games/scummvm-tools/pkg/PLIST
@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2004/02/01 06:18:24 jolan Exp $
+bin/descumm
+bin/descumm6
+bin/extract
+bin/rescumm
+bin/simon1decr
+bin/simon2mp3
+share/doc/scummvm-tools/README
+@dirrm share/doc/scummvm-tools