diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 83af63270b6..20d8db5dde2 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 01:06:22 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/08/06 12:53:29 fgsch Exp $
 
 COMMENT=	"X11 frontend for GNU Chess and the Internet Chess Server"
 
-DISTNAME=       xboard-4.0.7
-CATEGORIES=	games
+DISTNAME=       xboard-4.2.3
+CATEGORIES=	games x11
 NEED_VERSION=	1.402
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	xboard
@@ -16,5 +16,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE=	gnu
+USE_X11=
 
 .include <bsd.port.mk>
diff --git a/games/xboard/files/md5 b/games/xboard/files/md5
index 09c296348da..ec33b22a080 100644
--- a/games/xboard/files/md5
+++ b/games/xboard/files/md5
@@ -1,3 +1,3 @@
-MD5 (xboard-4.0.7.tar.gz) = ddc6c276e9422d5673bbe0805337ee58
-RMD160 (xboard-4.0.7.tar.gz) = bb72256aeec2f4efafdab2e58ed0291866f33ed4
-SHA1 (xboard-4.0.7.tar.gz) = 5d38da38ac77f5f9b3ca7cc77695edc1d2c305e6
+MD5 (xboard-4.2.3.tar.gz) = 6d2caef309675faa07633e6469cf655b
+RMD160 (xboard-4.2.3.tar.gz) = cf01930f322182e74f5fe5f0adf7966b2c4a7b97
+SHA1 (xboard-4.2.3.tar.gz) = 772c5108af79b54a94b12945426486f0e7700230
diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-Makefile_in
similarity index 85%
rename from games/xboard/patches/patch-aa
rename to games/xboard/patches/patch-Makefile_in
index 538f6333b8a..ceb327c1cf9 100644
--- a/games/xboard/patches/patch-aa
+++ b/games/xboard/patches/patch-Makefile_in
@@ -1,6 +1,7 @@
---- Makefile.in.orig	Mon Mar  6 09:53:10 2000
-+++ Makefile.in	Wed Apr  5 01:20:56 2000
-@@ -62,16 +62,14 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/08/06 12:53:29 fgsch Exp $
+--- Makefile.in.orig	Tue Feb 20 01:02:22 2001
++++ Makefile.in	Mon Aug  6 07:39:53 2001
+@@ -63,16 +63,14 @@ more: all pseudo-source info FAQ html dv
  
  install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \
  		zic2xpm.man
diff --git a/games/xboard/pkg/PLIST b/games/xboard/pkg/PLIST
index 337a4e0b0fa..be1a84c7856 100644
--- a/games/xboard/pkg/PLIST
+++ b/games/xboard/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/06/28 06:43:43 fgsch Exp $
-bin/xboard
+@comment $OpenBSD: PLIST,v 1.3 2001/08/06 12:53:29 fgsch Exp $
+@unexec install-info --delete --info-dir=%D/info %D/info/xboard.info
 bin/cmail
 bin/pxboard
+bin/xboard
 bin/zic2xpm
-man/man6/xboard.6
-man/man6/cmail.6
-man/man6/zic2xpm.6
 info/xboard.info
+man/man6/cmail.6
+man/man6/xboard.6
+man/man6/zic2xpm.6
+@exec install-info --info-dir=%D/info %D/info/xboard.info