diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index e59edda7b823..8025c603540e 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	xspread
 PORTVERSION=	3.1.1c
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://archive.debian.org/%SUBDIR%/ \
 		http://mirror.safehostnet.com/debian-archive/%SUBDIR%/ \
 		http://mirrors.xmission.com/debian-archive/%SUBDIR%/ \
 		http://vos-systems.net/ftp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	debian/dists/potato/main/source/math
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Spreadsheet program for X and terminals
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GNU_GENERAL
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	*
 PLIST_FILES=	bin/pxspread bin/xspread \
 		share/man/man1/pxspread.1.gz \
 		share/man/man1/xspread.1.gz
 
 OPTIONS_DEFINE=	X11 DOCS
 
 X11_USE=		XORG=x11,xau,xcb,xdmcp,xt
 X11_USES=		localbase xorg
 X11_CONFIGURE_ENV_OFF=	ac_cv_header_X11_X_h=no
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/local/lib/libXt|${LOCALBASE}/lib/libXt|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|^void main|int main|' ${WRKSRC}/psc.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pxspread ${STAGEDIR}${PREFIX}/bin/pxspread
 	${INSTALL_PROGRAM} ${WRKSRC}/xspread ${STAGEDIR}${PREFIX}/bin/xspread
 	${INSTALL_MAN} ${WRKSRC}/pxspread.man ${STAGEDIR}${PREFIX}/share/man/man1/pxspread.1
 	${INSTALL_MAN} ${WRKSRC}/xspread.man ${STAGEDIR}${PREFIX}/share/man/man1/xspread.1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/x/notes ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "doc documents sample_files tests" ${STAGEDIR}${DOCSDIR} "! -name *.tmp")
 
 .include <bsd.port.mk>
diff --git a/math/xspread/files/patch-interp.c b/math/xspread/files/patch-interp.c
index b3b52477548e..03306f8858f3 100644
--- a/math/xspread/files/patch-interp.c
+++ b/math/xspread/files/patch-interp.c
@@ -1,11 +1,20 @@
---- interp.c.orig	1995-11-07 02:17:26 UTC
+--- interp.c.orig
 +++ interp.c
-@@ -516,7 +516,7 @@ int mo, day, yr;
+@@ -33,7 +33,7 @@
+ #include <setjmp.h>
+ #include <ctype.h>
+ 
+-extern int errno;		/* set by math functions */
++#include <errno.h>
+ 
+ #include "sc.h"
+ 
+@@ -516,7 +516,7 @@
      mdays[1] = 28 + (yr%4 == 0);
  
      if (mo < 1 || mo > 12 || day < 1 || day > mdays[--mo] ||
 -		yr > 1999 || yr < 1970) {
 +		yr > 2099 || yr < 1970) {
  	scerror("@dts: invalid argument");
  	cellerror = CELLERROR;
  	return(0.0);