3 files changed, 52 insertions, 1 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 2cfe3313c9af..1e386a3da758 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -9,7 +9,8 @@ SUBDIR=	sendmail
 
 BIN1=	amd.map apmd.conf auth.conf \
 	crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
-	dhclient.conf disktab fbtab ftpusers gettytab group \
+	dhclient.conf disktab fbtab freebsd-update.conf \
+	ftpusers gettytab group \
 	hosts hosts.allow hosts.equiv hosts.lpd \
 	inetd.conf login.access login.conf mac.conf motd \
 	netconfig network.subr networks newsyslog.conf nsswitch.conf \
diff --git a/etc/freebsd-update.conf b/etc/freebsd-update.conf
new file mode 100644
index 000000000000..7a3055ca92b6
--- /dev/null
+++ b/etc/freebsd-update.conf
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+# Trusted keyprint.  Changing this is a Bad Idea unless you've received
+# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
+# change it and explaining why.
+KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
+
+# Server or server pool from which to fetch updates.  You can change
+# this to point at a specific server if you want, but in most cases
+# using a "nearby" server won't provide a measurable improvement in
+# performance.
+ServerName update.FreeBSD.org
+
+# Components of the base system which should be kept updated.
+Components src world kernel
+
+# Example for updating the userland and the kernel source code only:
+# Components src/base src/sys world
+
+# Paths which start with anything matching an entry in an IgnorePaths
+# statement will be ignored.
+IgnorePaths
+
+# Paths which start with anything matching an entry in an UpdateIfUnmodified
+# statement will only be updated if the contents of the file have not been
+# modified by the user.
+UpdateIfUnmodified /etc/ /var/
+
+### Default configuration options:
+
+# Directory in which to store downloaded updates and temporary
+# files used by FreeBSD Update.
+# WorkDir /var/db/freebsd-update
+
+# Destination to send output of "freebsd-update cron" if an error
+# occurs or updates have been downloaded.
+# MailTo root
+
+# Is FreeBSD Update allowed to create new files?
+# AllowAdd yes
+
+# Is FreeBSD Update allowed to delete files?
+# AllowDelete yes
+
+# If the user has modified file ownership, permissions, or flags, should
+# FreeBSD Update retain this modified metadata when installing a new version
+# of that file?
+# KeepModifiedMetadata yes
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 1d099133c9a1..29b48622199c 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -32,6 +32,8 @@
     db
         entropy         uname=operator gname=operator mode=0700
         ..
+        freebsd-update
+        ..
         ipf             mode=0700
         ..
         pkg