diff --git a/src/etc/Makefile b/src/etc/Makefile
index bb6ce45d..fa694671 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.406 2015/08/04 04:24:08 jsg Exp $
+#	$OpenBSD: Makefile,v 1.407 2015/08/24 10:41:11 ajacoutot Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -210,19 +210,19 @@ distribution-etc-root-var: distrib-dirs
 		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 ${RCDAEMONS} \
 		    ${DESTDIR}/etc/rc.d
 	cd ${DESTDIR}/var; ln -fs ../tmp
-	touch ${DESTDIR}/usr/share/sysmerge/etcsum
-	touch ${DESTDIR}/usr/share/sysmerge/examplessum
+	touch ${DESTDIR}/var/sysmerge/etcsum
+	touch ${DESTDIR}/var/sysmerge/examplessum
 	cd ${DESTDIR}/ && \
 		sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
-		xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/etcsum || true
+		xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true
 	cd ${DESTDIR}/ && \
 		grep -h '/etc/examples/' \
 		    ${.CURDIR}/../distrib/sets/lists/base/{mi,md.${MACHINE}} | \
 		sort | \
-		xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/examplessum || true
+		xargs sha256 -h ${DESTDIR}/var/sysmerge/examplessum || true
 	cd ${DESTDIR}/ && \
 		sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
-	    	pax -w -d | gzip -9 > ${DESTDIR}/usr/share/sysmerge/etc.tgz
+	    	pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz
 
 distribution:
 	exec ${SUDO} ${MAKE} distribution-etc-root-var
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 4532951c..2e222e26 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.272 2015/07/21 04:06:04 yasuoka Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.273 2015/08/24 10:41:11 ajacoutot Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -622,10 +622,6 @@ usr
             ..
         ..
 
-	# ./usr/share/sysmerge
-        sysmerge
-        ..
-
         # ./usr/share/tabset
         tabset
         ..
@@ -753,6 +749,10 @@ var
     run
     ..
 
+    # ./var/sysmerge
+    sysmerge			uname=root gname=wheel mode=0700
+    ..
+
     # ./var/spool
     spool
 
diff --git a/src/etc/mtree/BSD.x11.dist b/src/etc/mtree/BSD.x11.dist
index 3523fb29..de30d75a 100644
--- a/src/etc/mtree/BSD.x11.dist
+++ b/src/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-#       $OpenBSD: BSD.x11.dist,v 1.38 2015/04/15 07:41:53 jsg Exp $
+#       $OpenBSD: BSD.x11.dist,v 1.39 2015/08/24 10:41:11 ajacoutot Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 .
@@ -417,10 +417,6 @@
                 ..
             ..
         ..
-        share
-            sysmerge
-            ..
-        ..
     ..
     var
         cache
@@ -433,5 +429,7 @@
         ..
         log
         ..
+        sysmerge uname=root gname=wheel mode=0700
+        ..
     ..
 ..