diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 3baf802a5fab..372207898aea 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -36,10 +36,20 @@ CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE}
 
+.include <bsd.port.pre.mk>
+
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 .endif
 
+.if defined(WITH_ACL_SUPPORT)
+.if ${OSVERSION} < 500018
+BROKEN=	"Requires a recent FreeBSD 5.0-CURRENT"
+.else
+CONFIGURE_ARGS+=--with-acl-support
+.endif
+.endif
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 MAN1=		findsmb.1 make_smbcodepage.1 rpcclient.1 make_unicodemap.1 \
@@ -114,4 +124,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 3baf802a5fab..372207898aea 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -36,10 +36,20 @@ CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 		--with-sambabook=${PREFIX}/share/swat/using_samba \
 		--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE}
 
+.include <bsd.port.pre.mk>
+
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 .endif
 
+.if defined(WITH_ACL_SUPPORT)
+.if ${OSVERSION} < 500018
+BROKEN=	"Requires a recent FreeBSD 5.0-CURRENT"
+.else
+CONFIGURE_ARGS+=--with-acl-support
+.endif
+.endif
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 MAN1=		findsmb.1 make_smbcodepage.1 rpcclient.1 make_unicodemap.1 \
@@ -114,4 +124,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>