diff --git a/ftp/bsdftpd-ssl/Makefile b/ftp/bsdftpd-ssl/Makefile
index 0af9302d8e1b..259821d2de61 100644
--- a/ftp/bsdftpd-ssl/Makefile
+++ b/ftp/bsdftpd-ssl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bsdftpd-ssl
-# Date created:				5 Apr 2003
-# Whom:					Nick Leuta
-#
+# Created by: Nick Leuta
 # $FreeBSD$
-#
 
 PORTNAME=	bsdftpd-ssl
 PORTVERSION=	1.1.0
@@ -23,6 +19,8 @@ COMMENT=	FTP command-line client utility with the TLS/SSL support
 
 USE_OPENSSL=	yes
 
+MAKE_ENV+=	OBJFORMAT=	elf
+
 .include <bsd.port.pre.mk>
 
 # Client only part
@@ -37,7 +35,7 @@ MAN1=	ftps.1
 MAN5=	ftpchroot.5 xferlog.5
 MAN8=	ftpd.8
 MLINKS=	ftpd.8 ftpd-ssl.8 ftpchroot.5 ftpchroot-ssl.5
-.ifndef NOPORTEXAMPLES
+.if ${PORT_OPTIONS:MEXAMPLES}
 SUB_FILES=	pkg-message
 .endif
 USE_RC_SUBR=	${PORTNAME}
@@ -82,7 +80,7 @@ do-install:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} -p ${WRKSRC}/COPYRIGHT ${DOCDIR}/COPYRIGHT
 	${INSTALL_DATA} -p ${WRKSRC}/README ${DOCDIR}/README
@@ -106,7 +104,7 @@ post-install:
 	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh
 .endif
 .if !defined(CLIENT_ONLY)
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/rc.conf.d
 	${INSTALL_DATA} -p ${FILESDIR}/README.examples ${EXAMPLESDIR}/README
 	${INSTALL_DATA} -p ${FILESDIR}/ftpchroot ${EXAMPLESDIR}/ftpchroot