diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index aafc0aa923..1f24f282b6 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -47,12 +47,12 @@ dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \
            /home ${prefix}/src ${localstatedir}/local \
            /media"
 
-dirs755-lsb = "/srv  \
+dirs755-lsb = "${servicedir} \
                ${prefix}/local ${prefix}/local/bin ${prefix}/local/games \
                ${prefix}/local/include ${prefix}/local/lib ${prefix}/local/sbin \
                ${prefix}/local/share ${prefix}/local/src \
                ${prefix}/lib/locale"
-dirs2775-lsb = "/var/mail"
+dirs2775-lsb = "${localstatedir}/mail"
 
 volatiles = "${@bb.utils.contains('FILESYSTEM_PERMS_TABLES', 'files/fs-perms-volatile-log.txt', 'log', '', d)} \
              ${@bb.utils.contains('FILESYSTEM_PERMS_TABLES', 'files/fs-perms-volatile-tmp.txt', 'tmp', '', d)}"