diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 0fcd2d7ad332..ef983801e852 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -1,59 +1,67 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	nettle
 PORTVERSION=	3.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	GNU \
 		https://www.lysator.liu.se/~nisse/archive/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Low-level cryptographic library
 
 LICENSE=	GPLv2+ LGPL3
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYINGv2
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYINGv3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSERv3
 
 BUILD_DEPENDS=	gmp>=6.0.0:math/gmp
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 USES=		compiler:c11 gmake localbase makeinfo pathfix
 
+OPTIONS_DEFINE=	DOCS EXAMPLES FAT
+
+OPTIONS_DEFAULT_aarch64=	FAT
+OPTIONS_DEFAULT_amd64=		FAT
+OPTIONS_DEFAULT_armv7=		FAT
+
+FAT_DESC=	Build fat library
+FAT_CONFIGURE_ENABLE=	fat
+
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	M4="/usr/bin/m4 -g"
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+TEST_TARGET=	check
 
 INFO=		nettle
 PORTDOCS=	NEWS README nettle.html nettle.pdf
 PORTEXAMPLES=	*.c *.h
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 CONFIGURE_ENV+=	CCPIC=-fPIC
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/libdir=/ s|lib32|lib|' ${WRKSRC}/configure
 .if ${ARCH} == "mips64"
 	@${REINPLACE_CMD} -e 's|__sgi|__unix__|' ${WRKSRC}/configure
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>