diff --git a/sysutils/pies/Makefile b/sysutils/pies/Makefile
index c7ae489d8224..44f417495163 100644
--- a/sysutils/pies/Makefile
+++ b/sysutils/pies/Makefile
@@ -1,35 +1,39 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	pies
-PORTVERSION=	1.5
+PORTVERSION=	1.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
 
 MAINTAINER=	zeus@gnu.org.ua
 COMMENT=	Program Invocation and Execution Supervisor
 
 LICENSE=	GPLv3+
 
 USES=		charsetfix gmake iconv tar:bz2
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	${PORTNAME}
+TEST_TARGET=	check
 
 INFO=		${PORTNAME}
 PORTDOCS=	ChangeLog NEWS README
 
 OPTIONS_DEFINE=	DOCS INETD NLS PAM
 OPTIONS_SUB=	yes
 
 INETD_DESC=	Build and install replacement for inetd(8)
 
 INETD_CONFIGURE_ON=	--enable-inetd
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 PAM_CONFIGURE_OFF=	--disable-pam
 
+post-patch:
+	@${REINPLACE_CMD} -e '/abend\.at/d' ${WRKSRC}/grecs/tests/testsuite.at
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/pies/distinfo b/sysutils/pies/distinfo
index 7fbe99f54958..9cd42465007c 100644
--- a/sysutils/pies/distinfo
+++ b/sysutils/pies/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607929167
-SHA256 (pies-1.5.tar.bz2) = 0e738105b4d4cd7881e3a00df64c844f852feab4e755de8a54366a4931324186
-SIZE (pies-1.5.tar.bz2) = 1241919
+TIMESTAMP = 1641117269
+SHA256 (pies-1.7.tar.bz2) = 600c2f306191b27a64f4ecaaa0ba583ed4eb20e8eceac900c3a558e305544c2a
+SIZE (pies-1.7.tar.bz2) = 1250531
diff --git a/sysutils/pies/files/patch-grecs_tests_epp.at b/sysutils/pies/files/patch-grecs_tests_epp.at
new file mode 100644
index 000000000000..e294cbe5fd54
--- /dev/null
+++ b/sysutils/pies/files/patch-grecs_tests_epp.at
@@ -0,0 +1,13 @@
+--- grecs/tests/epp.at.orig	2021-09-06 16:30:24 UTC
++++ grecs/tests/epp.at
+@@ -15,7 +15,9 @@
+ # along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
+ AT_SETUP([External preprocessor])
+ 
+-AT_CHECK([m4 -s </dev/null 2>/dev/null || AT_SKIP_TEST])
++AT_CHECK([m4 -s </dev/null 2>/dev/null || AT_SKIP_TEST],[0],[stdout])
++# On FreeBSD, m4 outputs a single '#line 1 "stdin"' line
++AT_CHECK([s=`sed -e '/^#line/d' stdout`; test -z "$s" || AT_SKIP_TEST])
+ 
+ AT_CHECK([
+ AT_DATA([input],
diff --git a/sysutils/pies/pkg-plist b/sysutils/pies/pkg-plist
index e489f88bbb50..254292bbd33a 100644
--- a/sysutils/pies/pkg-plist
+++ b/sysutils/pies/pkg-plist
@@ -1,12 +1,11 @@
 bin/piesctl
 %%INETD%%sbin/inetd
 sbin/pies
 %%NLS%%share/locale/de/LC_MESSAGES/pies.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pies.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pies.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/pies.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/pies.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pies.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/pies.mo
-%%DATADIR%%/1.5/include/pp-setup
 @dir /var/pies