diff --git a/network/samba/samba.conf b/network/samba/samba.conf
index a9a75a824..303c5e4ee 100644
--- a/network/samba/samba.conf
+++ b/network/samba/samba.conf
@@ -27,8 +27,12 @@ fi
 [ "$sysconfdir" = "$root/etc" ] && \
 	sysconfdir=$root/etc/samba
 
+if pkginstalled -f fhs; then
+	var_append extraconfopt ' ' "--with-fhs"
+fi
+
 var_append extraconfopt " " "--with-automount --with-syslog \
---with-acl-support --with-libsmbclient --with-quotas --with-fhs \
+--with-acl-support --with-libsmbclient --with-quotas \
 --with-configdir=$sysconfdir \
 --with-privatedir=$sysconfdir/private \
 --with-codepagedir=$sysconfdir/codepages \