Index: head/security/aespipe/Makefile
===================================================================
--- head/security/aespipe/Makefile
+++ head/security/aespipe/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aespipe
-PORTVERSION=	2.4d
+PORTVERSION=	2.4e
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 MASTER_SITES=	http://loop-aes.sourceforge.net/${PORTNAME}/ \
@@ -16,11 +16,24 @@
 RUN_DEPENDS=	gpg:security/gnupg
 
 USES=		tar:bzip2
-
 GNU_CONFIGURE=	yes
 TEST_TARGET=	tests
 
 PLIST_FILES=	bin/aespipe man/man1/aespipe.1.gz
+
+OPTIONS_DEFINE_amd64=	ASM INTEL PADLOCK
+OPTIONS_DEFINE_i386=	ASM INTEL PADLOCK
+
+INTEL_DESC=		Support Intel hardware AES
+PADLOCK_DESC=		Support VIA Padlock hardware AES
+
+ASM_CONFIGURE_ENABLE=	asm=${ARCH:S/i386/x86/}
+
+INTEL_CONFIGURE_ENABLE=	intelaes
+INTEL_IMPLIES=		ASM
+
+PADLOCK_CONFIGURE_ENABLE=	padlock
+PADLOCK_IMPLIES=	ASM
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
Index: head/security/aespipe/distinfo
===================================================================
--- head/security/aespipe/distinfo
+++ head/security/aespipe/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473772861
-SHA256 (aespipe-v2.4d.tar.bz2) = c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f
-SIZE (aespipe-v2.4d.tar.bz2) = 106703
+TIMESTAMP = 1516130550
+SHA256 (aespipe-v2.4e.tar.bz2) = bad5abb8678c2a6062d22b893171623e0c8e6163b5c1e6e5086e2140e606b93a
+SIZE (aespipe-v2.4e.tar.bz2) = 107741