diff --git a/comms/mlan3/Makefile b/comms/mlan3/Makefile
index 6f3ba8f7ca80..b0ee6fe46d1f 100644
--- a/comms/mlan3/Makefile
+++ b/comms/mlan3/Makefile
@@ -13,4 +13,8 @@ COMMENT=	Version 3.00 beta API for Dallas Semiconductors 1-wire lan devices
 NO_WRKSUBDIR=	yes
 USES=		uidfix zip
 
+post-patch:
+	@${REINPLACE_CMD} -e '/int main/s/short argc/int argc/' \
+		${WRKSRC}/apps/gethumd/gethumd.c ${WRKSRC}/apps/shaapp/shaapp.c
+
 .include <bsd.port.mk>
diff --git a/comms/mlan3/files/patch-Makefiles b/comms/mlan3/files/patch-Makefiles
index 75fe735a11b9..a715cff3ed9c 100644
--- a/comms/mlan3/files/patch-Makefiles
+++ b/comms/mlan3/files/patch-Makefiles
@@ -43,7 +43,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -61,7 +61,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -79,7 +79,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -97,7 +97,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -115,7 +115,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -133,7 +133,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -151,7 +151,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -165,7 +165,7 @@
 +CFLAGS=         -I. -Wall -I ../../common
 +LDFLAGS=	-L ../../common -L ../../lib/userial
 +LDADD=		-lmlanser -lmlancom 
-+NOMAN=		true
++NO_MAN=		true
 +SRCS=           tstfind.c
 +
 +.include	<bsd.prog.mk>
@@ -180,7 +180,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -198,7 +198,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}
@@ -212,7 +212,7 @@
 +CFLAGS=         -I. -Wall -I ../../common
 +LDFLAGS=	-L ../../common -L ../../lib/userial
 +LDADD=		-lmlanser -lmlancom 
-+NOMAN=		true
++NO_MAN=		true
 +SRCS=           tstfind.c
 +
 +.include	<bsd.prog.mk>
@@ -227,7 +227,7 @@
 +CFLAGS=         -I. -Wall -I${MLANCOM}
 +LDADD=		-L${MLANLIB} -lmlan
 +DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
++NO_MAN=		1
 +SRCS=           ${PROG}.c
 +
 +test:		${PROG}