diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index c36744e5f57..3b8ca1eff74 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -1,19 +1,18 @@
-# $OpenBSD: Makefile,v 1.9 2001/10/28 13:05:48 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.10 2002/11/23 07:25:59 pvalchev Exp $
 
 COMMENT=	"spreadsheet program under X11"
 
 DISTNAME=	xspread3.1.1c
 PKGNAME=	xspread-3.1.1c
 CATEGORIES=	math
-NEED_VERSION=	1.402
 
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://linux.tucows.com/files/x11/office/
+MASTER_SITES=	${MASTER_SITE_OPENBSD}
 
 USE_X11=	Yes
 CONFIGURE_STYLE=	gnu old
@@ -25,13 +24,14 @@ INSTALL_TARGET= install install.man
 post-install:
 	@find ${WRKSRC} -name "*.tmp" -delete || /usr/bin/true
 	${INSTALL_DATA_DIR} \
-		${PREFIX}/share/xspread/{doc,documents,sample_files,tests}
+		${PREFIX}/share/xspread/{doc,documents,tests}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xspread
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/xspread
 	${INSTALL_DATA} ${WRKSRC}/x/notes ${PREFIX}/share/xspread
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/xspread/doc
 	${INSTALL_DATA} ${WRKSRC}/documents/* ${PREFIX}/share/xspread/documents
 	${INSTALL_DATA} ${WRKSRC}/sample_files/* \
-		${PREFIX}/share/xspread/sample_files
+		${PREFIX}/share/examples/xspread
 	${INSTALL_DATA} ${WRKSRC}/tests/* ${PREFIX}/share/xspread/tests
 
 .include <bsd.port.mk>
diff --git a/math/xspread/patches/patch-ab b/math/xspread/patches/patch-Makefile_in
similarity index 82%
rename from math/xspread/patches/patch-ab
rename to math/xspread/patches/patch-Makefile_in
index 551d2dd7b9b..0a96b5033e2 100644
--- a/math/xspread/patches/patch-ab
+++ b/math/xspread/patches/patch-Makefile_in
@@ -1,6 +1,7 @@
---- Makefile.in.orig	Fri Aug 18 07:18:30 2000
-+++ Makefile.in	Fri Aug 18 07:50:48 2000
-@@ -19,11 +19,11 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2002/11/23 07:25:59 pvalchev Exp $
+--- Makefile.in.orig	Tue Nov  7 03:17:18 1995
++++ Makefile.in	Fri Nov 22 15:31:18 2002
+@@ -19,11 +19,11 @@ CC	= @CC@
  CFLAGS	= @CFLAGS@
  DEFS	= @DEFS@
  LIBS	= @LIBS@
@@ -14,7 +15,7 @@
  INSTALL_PROGRAM	= $(INSTALL)
  INSTALL_DATA	= $(INSTALL)
  INSTALLFLAGS	= -c
-@@ -81,10 +81,10 @@
+@@ -81,10 +81,10 @@ $(PROGRAM): $(OBJS) $(DEPLIBS) gram.o le
  	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) gram.o lex.o $(LOCAL_LIBRARIES) $(LIBS) $(EXTRA_LOAD_FLAGS)
  
  install:: xspread
@@ -27,7 +28,7 @@
  
  uninstall::
  	-$(RM) $(bindir)/xspread
-@@ -92,8 +92,8 @@
+@@ -92,8 +92,8 @@ uninstall::
  
  
  install.man:: xspread.man
diff --git a/math/xspread/patches/patch-aa b/math/xspread/patches/patch-interp_c
similarity index 55%
rename from math/xspread/patches/patch-aa
rename to math/xspread/patches/patch-interp_c
index 93c14a6d82d..3f617879568 100644
--- a/math/xspread/patches/patch-aa
+++ b/math/xspread/patches/patch-interp_c
@@ -1,6 +1,7 @@
---- interp.c.orig	Fri Aug 18 07:06:29 2000
-+++ interp.c	Fri Aug 18 07:06:40 2000
-@@ -516,7 +516,7 @@
+$OpenBSD: patch-interp_c,v 1.1 2002/11/23 07:25:59 pvalchev Exp $
+--- interp.c.orig	Tue Nov  7 03:17:26 1995
++++ interp.c	Fri Nov 22 15:31:18 2002
+@@ -516,7 +516,7 @@ int mo, day, yr;
      mdays[1] = 28 + (yr%4 == 0);
  
      if (mo < 1 || mo > 12 || day < 1 || day > mdays[--mo] ||
diff --git a/math/xspread/pkg/PLIST b/math/xspread/pkg/PLIST
index 0c2ac65dc5b..c971ff3ef0d 100644
--- a/math/xspread/pkg/PLIST
+++ b/math/xspread/pkg/PLIST
@@ -1,8 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2000/08/19 04:41:08 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/11/23 07:25:59 pvalchev Exp $
 bin/xspread
 bin/pxspread
-share/xspread/README
-share/xspread/notes
 share/xspread/doc/Sample_Run
 share/xspread/doc/final_rpt
 share/xspread/doc/last_xspread
@@ -27,17 +25,17 @@ share/xspread/documents/report.dvi
 share/xspread/documents/report.log
 share/xspread/documents/report.ps
 share/xspread/documents/report.tex
-share/xspread/sample_files/demo_dates
-share/xspread/sample_files/demo_func
-share/xspread/sample_files/demo_math
-share/xspread/sample_files/demo_matrix
-share/xspread/sample_files/demo_strval
-share/xspread/sample_files/ex1
-share/xspread/sample_files/ex1o
-share/xspread/sample_files/ex2
-share/xspread/sample_files/ex2o
-share/xspread/sample_files/ex3
-share/xspread/sample_files/tutorial
+share/examples/xspread/demo_dates
+share/examples/xspread/demo_func
+share/examples/xspread/demo_math
+share/examples/xspread/demo_matrix
+share/examples/xspread/demo_strval
+share/examples/xspread/ex1
+share/examples/xspread/ex1o
+share/examples/xspread/ex2
+share/examples/xspread/ex2o
+share/examples/xspread/ex3
+share/examples/xspread/tutorial
 share/xspread/tests/Makefile
 share/xspread/tests/READ_ME
 share/xspread/tests/copy.cmp
@@ -61,8 +59,8 @@ share/xspread/tests/tester.sh
 share/xspread/tests/txt.sc
 man/man1/xspread.1
 man/man1/pxspread.1
+@dirrm share/examples/xspread
 @dirrm share/xspread/tests
-@dirrm share/xspread/sample_files
 @dirrm share/xspread/documents
 @dirrm share/xspread/doc
 @dirrm share/xspread