diff --git a/security/openssl-unsafe/Makefile b/security/openssl-unsafe/Makefile
index cd8e06d2a35d..172d18b34a2f 100644
--- a/security/openssl-unsafe/Makefile
+++ b/security/openssl-unsafe/Makefile
@@ -1,79 +1,76 @@
 PORTNAME=	openssl
 PORTVERSION=	1.0.2.20170706
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	-unsafe
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Unsafe SSL and crypto library
 WWW=		https://onwebsecurity.com/pages/openssl.html
 
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe perl5
 CPE_VERSION=	1.0.2k
 
-.if ${MACHINE} == "i386"
-#USE_GCC=	8+
-.endif
 USE_GITHUB=	yes
 GH_ACCOUNT=	PeterMosmans
 GH_TAGNAME=	c9ba19c
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	enable-camellia enable-cms enable-ec enable-ec2m \
 		enable-ecdh enable-ecdsa enable-gost enable-idea enable-md2 enable-mdc2 \
 		enable-rc2 enable-rc5 enable-rfc3779 enable-seed enable-ssl-trace \
 		enable-ssl2 enable-ssl2-methods enable-ssl3 enable-weak-ssl-ciphers \
 		experimental-jpake experimental-store \
 		no-gmp sctp shared threads zlib zlib-dynamic
 MAKE_ENV+=	LIBRPATH="${PREFIX}/openssl-unsafe/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER}
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-fPIC -DPIC
 SUB_FILES=	pkg-message
 PLIST_SUB+=	SHLIBVER=${OPENSSL_SHLIBVER}
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64el"
 CONFIGURE_ARGS+=	enable-ec_nistp_64_gcc_128
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl-unsafe/etc
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \
 		${WRKSRC}/crypto/des/Makefile
 	${REINPLACE_CMD} -e 's|all install_docs |all |;s| tools$$||;s| build_tools$$||' ${WRKSRC}/Makefile.org
 	${REINPLACE_CMD} -e 's|\^GNU ld|GNU|' ${WRKSRC}/Makefile.shared
 
 do-configure:
 	${REINPLACE_CMD} -e "s|options 386|options|" \
 		${WRKSRC}/config
 	cd ${WRKSRC} \
 	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
 	./config --prefix=${PREFIX}/openssl-unsafe --openssldir=${OPENSSLDIR} \
 		--install_prefix=${STAGEDIR} \
 		-L${PREFIX}/openssl-unsafe/lib ${CONFIGURE_ARGS}
 
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \
 		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
 		-e 's|LIBVERSION=[^ ]* |LIBVERSION=${OPENSSL_SHLIBVER} |' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/bin/openssl
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/libcrypto.so.${OPENSSL_SHLIBVER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/libssl.so.${OPENSSL_SHLIBVER}
 .for i in ubsec gost capi gmp atalla sureware nuron cswift 4758cca padlock aep chil
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/engines/lib${i}.so
 .endfor
 
 test: build
 	cd ${WRKSRC} && ${MAKE} test
 
 .include <bsd.port.mk>