diff --git a/srcpkgs/bsd-games/patches/countmail.diff b/srcpkgs/bsd-games/patches/countmail.diff
new file mode 100644
index 00000000000..0f510eeadd9
--- /dev/null
+++ b/srcpkgs/bsd-games/patches/countmail.diff
@@ -0,0 +1,31 @@
+--- bsd-games-2.17/countmail/countmail.orig
++++ bsd-games-2.17/countmail/countmail
+@@ -39,27 +39,7 @@
+ 
+ # Count the messages in your mailbox, using only POSIX shell builtins.
+ #
+-# Caveats:
+-#
+-# The read loop is horrendously slow on every implementation I've
+-# tried.  I suggest using from(1) and wc(1) instead, though these are
+-# not shell builtins.
+-
+-# for krb.
+-#set -- `from -t`
+-#v=$3
+-set -- `from | wc -l`
+-v=$1
+-#v=`from | wc -l`
+-
+-#v=0
+-#exec 0</var/mail/$USER
+-#while read line; do
+-#  case "$line" in
+-#    "From "*) v=$(($v + 1)) ;;
+-#  esac
+-#done
+-#exec 0<&-
++v=$(grep -c "^From " /var/mail/$USER)
+ 
+ set --
+ g=0
diff --git a/srcpkgs/bsd-games/template b/srcpkgs/bsd-games/template
index 87e1ba5d6f4..d13d2bcca0f 100644
--- a/srcpkgs/bsd-games/template
+++ b/srcpkgs/bsd-games/template
@@ -1,7 +1,7 @@
 # Template file for 'bsd-games'.  Based on Arch PKGBUILD by Chris Brannon.
 pkgname=bsd-games
 version=2.17
-revision=3
+revision=4
 patch_args="-Np1"
 build_style=gnu-configure
 make_dirs="
@@ -12,7 +12,7 @@ hostmakedepends="flex words-en"
 makedepends="ncurses-devel"
 depends="words-en"
 short_desc="A linux port for a collection of BSD command line games"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"
 homepage="ftp://ftp.ibiblio.org/pub/Linux/games/"
 distfiles="ftp://ftp.lip6.fr/pub/linux/sunsite/games/${pkgname}-${version}.tar.gz"