diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 60815bdc584..6c1de7913a1 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,19 +1,21 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/15 05:04:26 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/04/04 11:01:22 kevlo Exp $
 
-DISTNAME=       xboard-4.0.5
+DISTNAME=       xboard-4.0.7
 CATEGORIES=	games
+NEED_VERSION=	1.226
 
 MAINTAINER=	angelos@openbsd.org
 
 LICENSE_TYPE=		GPL
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= xboard
 
-GNU_CONFIGURE=  yes
+FAKE=		Yes
+GNU_CONFIGURE=  Yes
 
 .include <bsd.port.mk>
diff --git a/games/xboard/files/md5 b/games/xboard/files/md5
index 076171a0788..09c296348da 100644
--- a/games/xboard/files/md5
+++ b/games/xboard/files/md5
@@ -1,3 +1,3 @@
-MD5 (xboard-4.0.5.tar.gz) = 56d42975f0a54e13fb4bd3fd8bd6cceb
-RMD160 (xboard-4.0.5.tar.gz) = 2fe1051f899952e2f50da6b302885136f6a17f8b
-SHA1 (xboard-4.0.5.tar.gz) = ef40f2e3b181c8cb2bf4a9569247dc48cee07bed
+MD5 (xboard-4.0.7.tar.gz) = ddc6c276e9422d5673bbe0805337ee58
+RMD160 (xboard-4.0.7.tar.gz) = bb72256aeec2f4efafdab2e58ed0291866f33ed4
+SHA1 (xboard-4.0.7.tar.gz) = 5d38da38ac77f5f9b3ca7cc77695edc1d2c305e6
diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-aa
new file mode 100644
index 00000000000..538f6333b8a
--- /dev/null
+++ b/games/xboard/patches/patch-aa
@@ -0,0 +1,27 @@
+--- Makefile.in.orig	Mon Mar  6 09:53:10 2000
++++ Makefile.in	Wed Apr  5 01:20:56 2000
+@@ -62,16 +62,14 @@
+ 
+ install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \
+ 		zic2xpm.man
+-	$(INSTALL_PROGRAM) -s xboard $(bindir)/xboard
+-	$(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm
+-	$(INSTALL_PROGRAM) cmail $(bindir)/cmail
+-	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
+-	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
+-	$(INSTALL_DATA) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext)
+-	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
+-	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
+-	-PATH=$$PATH:/sbin:/usr/sbin install-info \
+-		$(infodir)/xboard.info $(infodir)/dir
++	$(INSTALL_PROGRAM) xboard $(DESTDIR)$(bindir)/xboard
++	$(INSTALL_PROGRAM) zic2xpm $(DESTDIR)$(bindir)/zic2xpm
++	$(INSTALL) cmail $(DESTDIR)$(bindir)/cmail
++	$(INSTALL) $(srcdir)/pxboard $(DESTDIR)$(bindir)/pxboard
++	$(INSTALL_DATA) $(srcdir)/xboard.man $(DESTDIR)$(man6dir)/xboard$(man6ext)
++	$(INSTALL_DATA) $(srcdir)/cmail.man $(DESTDIR)$(man6dir)/cmail$(man6ext)
++	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
++	$(INSTALL_DATA) xboard.info $(DESTDIR)$(infodir)/xboard.info
+ 
+ installdirs: mkinstalldirs
+ 	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)