diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index c4f2cd5a82e5..e8e1f4357e2c 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -6,23 +6,26 @@
 #
 
 PORTNAME=	xboard
-PORTVERSION=	4.2.6
+PORTVERSION=	4.2.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.tim-mann.org/xboard/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	xboard
 
 MAINTAINER=	xaa+ports@timewasters.nl
-COMMENT=	X frontend for Crafty, GNUChess, Internet Chess Servers, or e-mail chess
+COMMENT=	X frontend for Crafty, GNUChess, Chess Servers, or e-mail chess
+
+BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 STRIP=
-MAN6=		xboard.6 cmail.6 zic2xpm.6
+MAN6=		xboard.6 zic2xpm.6
+INFO=		xboard
 
 .if defined(WITH_XAW3D)
-ONFIGURE_ARGS+= "--with-Xaw3d"
+CONFIGURE_ARGS+=	"--with-Xaw3d"
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
diff --git a/games/xboard/distinfo b/games/xboard/distinfo
index ab0325d746d1..1fae940b359a 100644
--- a/games/xboard/distinfo
+++ b/games/xboard/distinfo
@@ -1,2 +1,2 @@
-MD5 (xboard-4.2.6.tar.gz) = 1d6e38c61277eed6ad7af352586b37d5
-SIZE (xboard-4.2.6.tar.gz) = 1057625
+MD5 (xboard-4.2.7.tar.gz) = b70ad8ff7569975302c5fb402d5eea32
+SIZE (xboard-4.2.7.tar.gz) = 1318110
diff --git a/games/xboard/files/patch-Makefile.in b/games/xboard/files/patch-Makefile.in
new file mode 100644
index 000000000000..ca9f5bcb62e7
--- /dev/null
+++ b/games/xboard/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Feb 29 17:40:14 2004
++++ Makefile.in	Sun Feb 29 17:40:20 2004
+@@ -60,7 +60,7 @@
+ 
+ default: xboard zic2xpm
+ 
+-all: default pseudosource info FAQ html dvi ps
++all: default pseudosource info FAQ html
+ 
+ install: installdirs default
+ 	$(INSTALL_PROGRAM) -s xboard $(bindir)/xboard
diff --git a/games/xboard/files/patch-texi2man b/games/xboard/files/patch-texi2man
new file mode 100644
index 000000000000..fb9d687e29fd
--- /dev/null
+++ b/games/xboard/files/patch-texi2man
@@ -0,0 +1,13 @@
+--- texi2man.orig	Fri Nov 28 22:34:53 2003
++++ texi2man	Sat May 29 14:55:49 2004
+@@ -170,8 +170,8 @@
+ 
+     if (/\@include (.*)/) {
+ 	my $INCL;
+-        open($INCL, $1) or open($INCL, "../$1") or die "$1: $!";
+-        while (<$INCL>) {
++        open(INCL, $1) or open(INCL, "../$1") or die "$1: $!";
++        while (<INCL>) {
+             parse();
+         }
+         next;
diff --git a/games/xboard/pkg-plist b/games/xboard/pkg-plist
index e747b267d812..925453629db0 100644
--- a/games/xboard/pkg-plist
+++ b/games/xboard/pkg-plist
@@ -2,6 +2,3 @@ bin/xboard
 bin/cmail
 bin/pxboard
 bin/zic2xpm
-@unexec install-info --delete %D/info/xboard.info %D/info/dir
-info/xboard.info
-@exec install-info %D/info/xboard.info %D/info/dir