diff --git a/lang/pbasic/Makefile b/lang/pbasic/Makefile
index ffd2e45ad2ac..f3d16f8cce5f 100644
--- a/lang/pbasic/Makefile
+++ b/lang/pbasic/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	pbasic
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.berklix.org/pub/FreeBSD/ports/distfiles/ \
 		http://www.berklix.com/~jhs/ftp/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-2017-04-08
 
 MAINTAINER=	jhs@berklix.com
 COMMENT=	Phil Cockroft's Basic Interpreter (previously Rabbit Basic)
 #		Author of generic sources: "phil@cockcroft.de"
 
 LICENSE=	PD
 
 ALL_TARGET=	freebsd
 MAKEFILE=	makefile
 PLIST_FILES=	bin/pbasic share/man/man1/pbasic.1.gz
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/^CC/s/=/?=/' \
 		-e '/^CFLAGS/{s/=/+=/;s/-O//;}' \
 		${WRKSRC}/freebsd/makefile
 	${ECHO_CMD} '.PHONY: $$(SYSTEMS)' >>${WRKSRC}/makefile
 
 do-configure:
 	-cd ${WRKSRC} ; ${RM} -r termio m68000 msdos vax pyramid ns32000 \
 			pdp11 cursor/cursor.dos cursor/cursor.ukc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/basic ${STAGEDIR}${PREFIX}/bin/pbasic
 	${INSTALL_MAN} ${WRKSRC}/docs/basic.1 ${STAGEDIR}${PREFIX}/share/man/man1/pbasic.1
 
 .include <bsd.port.mk>
diff --git a/lang/pbasic/files/patch-bas3.c b/lang/pbasic/files/patch-bas3.c
new file mode 100644
index 000000000000..47ba91acc224
--- /dev/null
+++ b/lang/pbasic/files/patch-bas3.c
@@ -0,0 +1,18 @@
+--- bas3.c.orig
++++ bas3.c
+@@ -2,6 +2,7 @@
+  * BASIC by Phil Cockcroft
+  */
+ #include        "bas.h"
++#include        <errno.h>
+ 
+ /*
+  *      This file contains the numeric evaluation routines and some
+@@ -1513,7 +1514,6 @@
+  */
+ #define	MAX_SYS_ARGS	6
+ 
+-extern	int	errno;
+ #ifdef	__STDC__
+ extern	int	syscall(int, ...);
+ #else