diff --git a/etc/group b/etc/group
index 8f06e1a7f827..220e9e38621a 100644
--- a/etc/group
+++ b/etc/group
@@ -23,6 +23,7 @@ _httpd:*:24:
 _mdnsd:*:25:
 _tests:*:26:
 _tcpdump:*:27:
+_tss:*:28:
 guest:*:31:root
 nobody:*:39:
 utmp:*:45:
diff --git a/etc/master.passwd b/etc/master.passwd
index ef215f13b5b3..0bee8ab2edb6 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -17,5 +17,6 @@ _httpd:*:24:24::0:0:& pseudo-user:/var/www:/sbin/nologin
 _mdnsd:*:25:25::0:0:& pseudo-user:/nonexistent:/sbin/nologin
 _tests:*:26:26::0:0:& pseudo-user:/nonexistent:/sbin/nologin
 _tcpdump:*:27:27::0:0:& pseudo-user:/var/chroot/tcpdump:/sbin/nologin
+_tss:*:28:28::0:0:& pseudo-user:/var/tpm:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
 nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index b8a10ed0a261..a9a08d1bdb5d 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.94 2011/11/12 01:19:40 jmmv Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.95 2012/01/28 02:17:29 christos Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -180,6 +180,8 @@
 ./usr/include/security
 ./usr/include/sys
 ./usr/include/ssp
+./usr/include/trousers
+./usr/include/tss
 ./usr/include/ufs
 ./usr/include/ufs/ext2fs
 ./usr/include/ufs/ffs
@@ -1168,6 +1170,7 @@
 ./var/spool/sockets		mode=0777
 ./var/tmp			mode=01777
 ./var/tmp/vi.recover		mode=01777
+./var/tpm			uname=_tts gname=_tss mode=0750
 ./var/www
 ./var/yp
 ./var/yp/binding