diff --git a/security/aespipe/Makefile b/security/aespipe/Makefile
index 632de33b099d..740bcd6dff52 100644
--- a/security/aespipe/Makefile
+++ b/security/aespipe/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	aespipe
-DISTVERSION=	v2.4c
+PORTVERSION=	2.4d
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 MASTER_SITES=	http://loop-aes.sourceforge.net/${PORTNAME}/ \
 		http://koti.tnnet.fi/jari.ruusu/linux/
@@ -14,27 +15,15 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	gpg:security/gnupg
 
-USES=	tar:bzip2
+USES=		tar:bzip2
 
 GNU_CONFIGURE=	yes
+TEST_TARGET=	tests
+
 PLIST_FILES=	bin/aespipe man/man1/aespipe.1.gz
 
-.include <bsd.port.pre.mk>
-
-ALL_TARGET=
-.if ${ARCH} == amd64
-MAKE_ARGS=	amd64
-.endif
-
-.if ${ARCH} == i386
-MAKE_ARGS=	x86
-.endif
-
-post-build:
-	cd ${WRKSRC} && make tests
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/aespipe/distinfo b/security/aespipe/distinfo
index fca9c883c2c8..043835828776 100644
--- a/security/aespipe/distinfo
+++ b/security/aespipe/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aespipe-v2.4c.tar.bz2) = 260190beea911190a839e711f610ec3454a9b13985d35479775b7e26ad4c845e
-SIZE (aespipe-v2.4c.tar.bz2) = 106608
+TIMESTAMP = 1473772861
+SHA256 (aespipe-v2.4d.tar.bz2) = c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f
+SIZE (aespipe-v2.4d.tar.bz2) = 106703