diff --git a/games/spider/files/md5 b/games/spider/distinfo
similarity index 100%
rename from games/spider/files/md5
rename to games/spider/distinfo
diff --git a/games/spider/patches/patch-aa b/games/spider/patches/patch-Imakefile
similarity index 77%
rename from games/spider/patches/patch-aa
rename to games/spider/patches/patch-Imakefile
index f714b9de1c2..6b6975b3c01 100644
--- a/games/spider/patches/patch-aa
+++ b/games/spider/patches/patch-Imakefile
@@ -1,5 +1,6 @@
---- Imakefile.orig	Sat Sep 28 13:46:02 1991
-+++ Imakefile	Tue Sep 28 16:01:52 1999
+$OpenBSD: patch-Imakefile,v 1.1 2002/02/21 00:32:07 naddy Exp $
+--- Imakefile.orig	Sat Sep 28 19:46:02 1991
++++ Imakefile	Thu Feb 21 00:50:49 2002
 @@ -8,7 +8,7 @@
          SPLIT = split
          CAT = cat
@@ -18,7 +19,7 @@
  #endif
  
  #if OverrideDefs
-@@ -235,7 +235,7 @@
+@@ -235,7 +235,7 @@ DEFINES = $(TKDEFINES) -DHELPDIR="\"$(HE
  # endif
  #endif
  
diff --git a/games/spider/patches/patch-movelog_c b/games/spider/patches/patch-movelog_c
new file mode 100644
index 00000000000..cc3c13ed6dd
--- /dev/null
+++ b/games/spider/patches/patch-movelog_c
@@ -0,0 +1,31 @@
+$OpenBSD: patch-movelog_c,v 1.1 2002/02/21 00:32:07 naddy Exp $
+--- movelog.c.orig	Sat Sep 28 19:46:17 1991
++++ movelog.c	Thu Feb 21 01:26:42 2002
+@@ -745,6 +745,7 @@ char	*fname;
+ FILE	*fp;
+ char	buf[1024], buf2[1024];
+ char	*dp;
++int	c;
+ 
+ 	fname = remove_newlines(fname);
+ 	if ((fp = fopen(fname, "r")) == NULL)	{
+@@ -756,7 +757,8 @@ char	*dp;
+ 
+ 	/* read card string */
+ 	dp = buf;
+-	while ((*dp = (char)fgetc(fp)) != EOF)	{
++	while ((c = fgetc(fp)) != EOF)	{
++		*dp = c;
+ 		if (*dp == '\n')	/* ignore any CR */
+ 			continue;
+ 		if (*dp == '.')
+@@ -767,7 +769,8 @@ char	*dp;
+ 
+ 	/* read moves string */
+ 	dp = buf2;
+-	while ((*dp = (char)fgetc(fp)) != EOF)	{
++	while ((c = fgetc(fp)) != EOF)	{
++		*dp = c;
+ 		if (*dp == '\n')	/* ignore any CR */
+ 			continue;
+ 		if (*dp == '.')
diff --git a/games/spider/patches/patch-ab b/games/spider/patches/patch-spider_man
similarity index 65%
rename from games/spider/patches/patch-ab
rename to games/spider/patches/patch-spider_man
index 88c06de2559..b44d6cb9add 100644
--- a/games/spider/patches/patch-ab
+++ b/games/spider/patches/patch-spider_man
@@ -1,6 +1,7 @@
---- spider.man.orig	Sat Sep 28 13:46:06 1991
-+++ spider.man	Tue Sep 28 15:11:49 1999
-@@ -53,7 +53,7 @@
+$OpenBSD: patch-spider_man,v 1.1 2002/02/21 00:32:07 naddy Exp $
+--- spider.man.orig	Sat Sep 28 19:46:06 1991
++++ spider.man	Thu Feb 21 00:50:49 2002
+@@ -53,7 +53,7 @@ is "true".
  Specifies the time (in microseconds) to pause between each move when
  showing a Replay.  The default is 200.
  .TP 8