diff --git a/games/dungeon-crawl/Makefile b/games/dungeon-crawl/Makefile
new file mode 100644
index 00000000000..7d9e332a3ec
--- /dev/null
+++ b/games/dungeon-crawl/Makefile
@@ -0,0 +1,58 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+
+COMMENT=	'dungeon crawl'
+CATEGORIES=	games
+
+HOMEPAGE=	http://www.dungeoncrawl.org/
+MASTER_SITES=	ftp://ftp.dungeoncrawl.org/dev/4.0.x/src/
+DISTNAME=	dc400b26-src
+EXTRACT_SUFX=	.tbz2
+V=		4.0.0b26
+PKGNAME=	dungeon-crawl-$V
+
+BUILD_DEPENDS+=	:bzip2-*:archivers/bzip2
+
+EXTRACT_CASES+=	*.tbz2) ${BZIP2} -dc ${FULLDISTDIR}/$$archive | ${TAR} xf -;;
+
+
+WRKSRC=	${WRKDIST}/source
+MAKE_FILE=${WRKSRC}/makefile.bsd
+MAKE_FLAGS=EXTRA_FLAGS='${CXXFLAGS} -DSAVE_DIR_PATH=\"${TRUEPREFIX}/lib/dungeon-crawl-$V/\"' CXX='${CXX}' LDFLAGS=
+
+ALL_TARGET=debug
+
+WANTLIB=	c m stdc++ ncurses
+
+
+# Almost nethack... http://www.dungeoncrawl.org/?d.l
+
+PERMIT_DISTFILES_FTP=Yes
+PERMIT_PACKAGE_FTP=Yes
+PERMIT_DISTFILES_CDROM="No gain"
+PERMIT_PACKAGE_CDROM="No gain"
+DOCDIR=${PREFIX}/share/doc/dungeon-crawl-$V
+
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKBUILD}/crawl ${PREFIX}/bin/dungeon-crawl-$V
+	chgrp games ${PREFIX}/bin/dungeon-crawl-$V
+	chmod g+s ${PREFIX}/bin/dungeon-crawl-$V
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/dungeon-crawl-$V
+	chgrp games ${PREFIX}/lib/dungeon-crawl-$V
+	chmod g+w ${PREFIX}/lib/dungeon-crawl-$V
+	${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/dungeon-crawl-$V.6
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/licence.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/init.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/macro.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/docs/buglist.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/docs/changes* ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/docs/crawl.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/docs/todo.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/docs/versions.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/readme.txt ${DOCDIR}/quickstart
+
+NO_REGRESS=Yes
+
+SUBST_VARS=V
+.include <bsd.port.mk>
diff --git a/games/dungeon-crawl/distinfo b/games/dungeon-crawl/distinfo
new file mode 100644
index 00000000000..724d8597be8
--- /dev/null
+++ b/games/dungeon-crawl/distinfo
@@ -0,0 +1,4 @@
+MD5 (dc400b26-src.tbz2) = 807810185ff93f06bd4e169067644d8f
+RMD160 (dc400b26-src.tbz2) = d7bf03eb9978acd6997ec58d3ffbc8c166c63573
+SHA1 (dc400b26-src.tbz2) = faa18f41b9e8493b680cf2efd9bfae225eabc3ee
+SIZE (dc400b26-src.tbz2) = 823712
diff --git a/games/dungeon-crawl/patches/patch-docs_crawl_6 b/games/dungeon-crawl/patches/patch-docs_crawl_6
new file mode 100644
index 00000000000..b2dc23dde69
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-docs_crawl_6
@@ -0,0 +1,15 @@
+$OpenBSD: patch-docs_crawl_6,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- docs/crawl.6.orig	Wed Oct 19 12:01:32 2005
++++ docs/crawl.6	Wed Oct 19 12:01:42 2005
+@@ -1,9 +1,9 @@
+ .TH crawl 6 "02 April 2001"
+ .IX crawl
+ .SH NAME
+-crawl - play the roguelike game of crawl
++dungeon-crawl - play the roguelike game of crawl
+ .SH SYNOPSIS
+-.BR crawl
++.BR dungeon-crawl
+ [-scores [N]]
+ [-name <string>]
+ [-race <letter>]
diff --git a/games/dungeon-crawl/patches/patch-source_AppHdr_h b/games/dungeon-crawl/patches/patch-source_AppHdr_h
new file mode 100644
index 00000000000..0f20f20450d
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-source_AppHdr_h
@@ -0,0 +1,41 @@
+$OpenBSD: patch-source_AppHdr_h,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- source/AppHdr.h.orig	Mon Mar 24 02:05:12 2003
++++ source/AppHdr.h	Wed Oct 19 13:14:04 2005
+@@ -151,7 +151,7 @@
+     // Most of the linux stuff applies, and so we want it
+     #define LINUX
+     #define PLAIN_TERM
+-//#define MULTIUSER
++    #define MULTIUSER
+     #include "liblinux.h"
+ 
+     // The ALTCHARSET may come across as DEC characters/JIS on non-ibm platforms
+@@ -167,7 +167,7 @@
+ 
+     // This is used for BSD tchars type ioctl, use this if you can't
+     // use the Posix support above.
+-    #define USE_TCHARS_IOCTL
++    // #define USE_TCHARS_IOCTL
+ 
+     // This uses Unix signal control to block some things, may be
+     // useful in conjunction with USE_TCHARS_IOCTL.
+@@ -377,7 +377,9 @@
+     // Setting it to nothing or not setting it will cause all game files to
+     // be dumped in the current directory.
+     //
++#if !defined(SAVE_DIR_PATH)
+     #define SAVE_DIR_PATH       "/opt/crawl/lib/"
++#endif
+ 
+     // will make this little thing go away.  Define SAVE_PACKAGE_CMD
+     // to a command to compress and bundle the save game files into a
+@@ -389,9 +391,6 @@
+     //
+     // Comment these lines out if you want to leave the save files uncompressed.
+     //
+-    #define SAVE_PACKAGE_CMD    "/usr/bin/zip -m -q -j -1 %s.zip %s.*"
+-    #define LOAD_UNPACKAGE_CMD  "/usr/bin/unzip -q -o %s.zip -d" SAVE_DIR_PATH
+-    #define PACKAGE_SUFFIX      ".zip"
+ 
+     // This provides some rudimentary protection against people using
+     // save file cheats on multi-user systems.
diff --git a/games/dungeon-crawl/patches/patch-source_files_cc b/games/dungeon-crawl/patches/patch-source_files_cc
new file mode 100644
index 00000000000..1a1a33436c4
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-source_files_cc
@@ -0,0 +1,17 @@
+$OpenBSD: patch-source_files_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- source/files.cc.orig	Sat Oct 22 16:03:22 2005
++++ source/files.cc	Sat Oct 22 16:04:16 2005
+@@ -925,8 +925,13 @@ void save_game(bool leave_game)
+               "%s.sav", name_buff );
+ 
+ #else
++# ifdef SAVE_DIR_PATH
++    snprintf( charFile, sizeof(charFile), 
++              SAVE_DIR_PATH "%s%d", you.your_name, (int) getuid() );
++# else
+     strncpy(charFile, you.your_name, kFileNameLen);
+     charFile[kFileNameLen] = 0;
++# endif
+     strcat(charFile, ".sav");
+ 
+ #ifdef DOS
diff --git a/games/dungeon-crawl/patches/patch-source_libutil_cc b/games/dungeon-crawl/patches/patch-source_libutil_cc
new file mode 100644
index 00000000000..a3565ea6080
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-source_libutil_cc
@@ -0,0 +1,11 @@
+$OpenBSD: patch-source_libutil_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- source/libutil.cc.orig	Tue Oct 18 23:51:48 2005
++++ source/libutil.cc	Tue Oct 18 23:51:54 2005
+@@ -11,6 +11,7 @@
+ #include "AppHdr.h"
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ void get_input_line( char *const buff, int len )
+ {
diff --git a/games/dungeon-crawl/patches/patch-source_newgame_cc b/games/dungeon-crawl/patches/patch-source_newgame_cc
new file mode 100644
index 00000000000..2e41134df18
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-source_newgame_cc
@@ -0,0 +1,17 @@
+$OpenBSD: patch-source_newgame_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- source/newgame.cc.orig	Sat Oct 22 16:05:21 2005
++++ source/newgame.cc	Sat Oct 22 16:06:32 2005
+@@ -253,8 +253,13 @@ static bool check_saved_game(void)
+     }
+ 
+ #else
++# ifdef SAVE_DIR_PATH
++    snprintf( char_fil, sizeof(char_fil), 
++              SAVE_DIR_PATH "%s%d", you.your_name, (int) getuid() );
++# else
+     strcpy(char_fil, "");
+     strncat(char_fil, you.your_name, kFileNameLen);
++# endif
+     strcat(char_fil, ".sav");
+ #endif
+ 
diff --git a/games/dungeon-crawl/patches/patch-source_ouch_h b/games/dungeon-crawl/patches/patch-source_ouch_h
new file mode 100644
index 00000000000..5773d60b8aa
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-source_ouch_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-source_ouch_h,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- source/ouch.h.orig	Tue Oct 18 23:53:25 2005
++++ source/ouch.h	Tue Oct 18 23:53:32 2005
+@@ -54,7 +54,7 @@ void scrolls_burn(char burn_strength, ch
+  * called from: acr - bang - beam - command - effects - fight - misc -
+  *              ouch - output - religion - spells - spells2 - spells4
+  * *********************************************************************** */
+-void ouch(int dam, int death_source, char death_type, const char *aux = NULL);
++void ouch(int dam, int death_source, char death_type, const char *aux = 0);
+ 
+ 
+ // last updated 12may2000 {dlb}
diff --git a/games/dungeon-crawl/patches/patch-source_religion_cc b/games/dungeon-crawl/patches/patch-source_religion_cc
new file mode 100644
index 00000000000..f882d0036d7
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-source_religion_cc
@@ -0,0 +1,34 @@
+$OpenBSD: patch-source_religion_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- source/religion.cc.orig	Tue Oct 18 23:53:56 2005
++++ source/religion.cc	Tue Oct 18 23:54:14 2005
+@@ -53,18 +53,18 @@
+ #include "stuff.h"
+ 
+ const char *sacrifice[] = {
+-    {" glows silver and disappears."},
+-    {" glows a brilliant golden colour and disappears."},
+-    {" rots away in an instant."},
+-    {" crumbles to dust."},
+-    {" is eaten by a bug."},    /* Xom - no sacrifices */
+-    {" explodes into nothingness."},
+-    {" is consumed in a burst of flame."},
+-    {" is consumed in a roaring column of flame."},
+-    {" glows faintly for a moment, then is gone."},
+-    {" is consumed in a roaring column of flame."},
+-    {" glows with a rainbow of weird colours and disappears."},
+-    {" evaporates."}
++    " glows silver and disappears.",
++    " glows a brilliant golden colour and disappears.",
++    " rots away in an instant.",
++    " crumbles to dust.",
++    " is eaten by a bug.",    /* Xom - no sacrifices */
++    " explodes into nothingness.",
++    " is consumed in a burst of flame.",
++    " is consumed in a roaring column of flame.",
++    " glows faintly for a moment, then is gone.",
++    " is consumed in a roaring column of flame.",
++    " glows with a rainbow of weird colours and disappears.",
++    " evaporates."
+ };
+ 
+ void altar_prayer(void);
diff --git a/games/dungeon-crawl/patches/patch-source_spl-cast_h b/games/dungeon-crawl/patches/patch-source_spl-cast_h
new file mode 100644
index 00000000000..b57756334bb
--- /dev/null
+++ b/games/dungeon-crawl/patches/patch-source_spl-cast_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-source_spl-cast_h,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+--- source/spl-cast.h.orig	Tue Oct 18 23:55:20 2005
++++ source/spl-cast.h	Tue Oct 18 23:55:25 2005
+@@ -43,7 +43,7 @@ bool your_spells( int spc2, int powc = 0
+  *              misc - mstuff2 - religion - spell - spl-book - spells4
+  * *********************************************************************** */
+ bool miscast_effect( unsigned int sp_type, int mag_pow, int mag_fail, 
+-                     int force_effect, const char *cause = NULL );
++                     int force_effect, const char *cause = 0 );
+ 
+ 
+ #endif
diff --git a/games/dungeon-crawl/pkg/DESCR b/games/dungeon-crawl/pkg/DESCR
new file mode 100644
index 00000000000..146209e3d22
--- /dev/null
+++ b/games/dungeon-crawl/pkg/DESCR
@@ -0,0 +1,12 @@
+Linley's dungeon-crawl is a dungeon slashing game. 
+It's very similar to nethack, to the extent that 
+most of the keys are the same, but it is a much harder game.
+
+Development has been somewhat sporadic, there might be a 4.1 version
+at some point.
+
+It's a text terminal-only game, but you can get colors, provided your
+TERM defines them.
+
+This package can coexist with later versions of dungeon-crawl, to allow
+players to finish their game.
diff --git a/games/dungeon-crawl/pkg/PLIST b/games/dungeon-crawl/pkg/PLIST
new file mode 100644
index 00000000000..e946c309bc2
--- /dev/null
+++ b/games/dungeon-crawl/pkg/PLIST
@@ -0,0 +1,22 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
+@option no-default-conflict
+@conflict dungeon-crawl-${V}
+@mode g+s
+@group games
+bin/dungeon-crawl-${V}
+@mode g+w
+lib/dungeon-crawl-${V}/
+@mode
+@group
+@man man/man6/dungeon-crawl-${V}.6
+share/doc/dungeon-crawl-${V}/
+share/doc/dungeon-crawl-${V}/buglist.txt
+share/doc/dungeon-crawl-${V}/changes.340
+share/doc/dungeon-crawl-${V}/changes.400
+share/doc/dungeon-crawl-${V}/crawl.txt
+share/doc/dungeon-crawl-${V}/init.txt
+share/doc/dungeon-crawl-${V}/licence.txt
+share/doc/dungeon-crawl-${V}/macro.txt
+share/doc/dungeon-crawl-${V}/quickstart
+share/doc/dungeon-crawl-${V}/todo.txt
+share/doc/dungeon-crawl-${V}/versions.txt