Index: etc/mtree/BSD.sendmail.dist
===================================================================
--- etc/mtree/BSD.sendmail.dist
+++ etc/mtree/BSD.sendmail.dist
@@ -7,8 +7,11 @@
 .               nochange
     var             nochange
         spool           nochange tags=package=runtime
-            clientmqueue    uname=smmsp gname=smmsp mode=0770
+            clientmqueue    uname=smmsp gname=smmsp mode=0770 tags=package=sendmail
             ..
-        ..
+/set gname=daemon
+            mqueue          tags=package=sendmail
+            ..
+       ..
     ..
 ..
Index: etc/mtree/BSD.var.dist
===================================================================
--- etc/mtree/BSD.var.dist
+++ etc/mtree/BSD.var.dist
@@ -84,8 +84,6 @@
     rwho            gname=daemon mode=0775
     ..
     spool
-        clientmqueue    uname=smmsp gname=smmsp mode=0770 tags=package=sendmail
-        ..
         dma             uname=root gname=mail mode=0770 tags=package=dma
         ..
         lock            uname=uucp gname=dialer mode=0775
@@ -93,8 +91,6 @@
 /set gname=daemon
         lpd
         ..
-        mqueue          tags=package=sendmail
-        ..
         opielocks       mode=0700
         ..
         output