diff --git a/core/filesystem/PKGBUILD b/core/filesystem/PKGBUILD
index b7a21cbeb..95a259879 100644
--- a/core/filesystem/PKGBUILD
+++ b/core/filesystem/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=filesystem
 pkgver=2012.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Base filesystem'
 arch=('any')
 license=('GPL')
@@ -11,7 +11,7 @@ url='http://www.archlinux.org'
 groups=('base')
 install='filesystem.install'
 makedepends=('asciidoc')
-depends=('iana-etc' 'bash' 'coreutils')
+depends=('iana-etc' 'bash' 'coreutils' 'nss-myhostname')
 backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
@@ -90,12 +90,12 @@ package() {
 }
 md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
          '7813c481156f6b280a3ba91fc6236368'
-         '13753e4e0964f3652b0cc60a28528bdf'
+         '9e4533df61f0c82d6b2e2371f7376282'
          '4c4540eeb748bf1f71d631b8c1dcf0b3'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
          '455b78cada80f40b6f6968f5cbd97a2e'
-         'b8355d9d2782f424f4cedcf682651be0'
+         '01249bb0ba4468f95e2cc3a627f5e6e3'
          'ca716f853860199c1286e7939b2f2666'
          '1745349eb24ed21b4cfaa6f423bddb76'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
@@ -106,5 +106,5 @@ md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
          '677523dbe94b79299aa91b35ed8203b6'
          'f3b6ae7db8adffaaa4bffc6099dcbd50'
          'a8a962370cd0128465d514e6a1f74130'
-         '3b6d203a3808943a47fb19498816537f'
+         'f339bbc45ff3ad4dd73039beab2f28e3'
          '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/core/filesystem/archlinux.7.txt b/core/filesystem/archlinux.7.txt
index 88aef734d..74eee5977 100644
--- a/core/filesystem/archlinux.7.txt
+++ b/core/filesystem/archlinux.7.txt
@@ -17,22 +17,21 @@ DESCRIPTION
 Arch Linux exposes the user to the system without hiding any details. This manpage gives a
 brief overview of the configuration files that should be set up on a fresh install.
 
-INITSCRIPTS[[I]]
-----------------
-The initscripts are configured in rc.conf. Here you configure what daemons to start on boot, what storage
-technologies should be enabled and, optionally, a basic network setup.
+SYSTEM SERVICES[[S]]
+--------------------
+System services to be started at boot can be enabled using 'systemctl enable <name>.service'. To view
+available services use 'systemctl list-unit-files'.
 
 HOSTNAME[[H]]
 -------------
-The hostname of the machine should be set in /etc/hostname. Additionally, either /etc/hosts should be
-configured accordingly, or nss-myhostname should be used. This is needed so the hostname can always
-be resolved to the current machine, which is required by some programs.
+The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'. It will then be
+written to /etc/hostname.
 
 LOCALIZATION[[L]]
 -----------------
 Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used
-can be configured in /etc/locale.conf. These settings can be overridden on a par-user basis by keeping a
-user-spcefic locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
+can be configured in /etc/locale.conf. These settings can be overridden on a per-user basis by keeping a
+user-specific locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
 
 VIRTUAL CONSOLE[[V]]
 --------------------
@@ -41,13 +40,13 @@ other things. Note that these settings only apply to the console, and not if you
 
 TIME[[T]]
 ---------
-The local timezone is configured by *symlinking* /etc/localtime to the correct zoneinfo file under
-/usr/share/zoneinfo/. E.g.,
+The local timezone is configured by calling 'timedatectl set-timezone <Region/City>'. A *symlink* is then created
+from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. E.g.,
 
-    /etc/localtime -> /usr/share/zoneinfo/Europe/Paris
+    /etc/localtime -> ../usr/share/zoneinfo/Europe/Paris
 
 The real-time clock, which keeps track of time when the computer is off, can be configured to either
-be in UTC or in localtime in /etc/adjtime. The default is UTC.
+be in UTC or in localtime by calling 'timedatectl set-local-rtc <false|true>'. The default is UTC.
 
 FILESYSTEMS[[F]]
 ----------------
@@ -73,8 +72,8 @@ and modules to be blacklisted from auto-loading can be configured in /etc/modpro
 SEE ALSO
 --------
 
-rc.conf(5), hostname(5), hosts(5), nsswitch.conf(5), locale.conf(5), vconsole.conf(5), timezone(3), hwclock(8), fstab(5), crypttab(5),
-mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
+systemctl(1), hostnamectl(1), hostname(5), locale.conf(5), vconsole.conf(5), timedatectl(1), timezone(3), hwclock(8), fstab(5),
+crypttab(5), mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
 
 AUTHORS
 -------
diff --git a/core/filesystem/nsswitch.conf b/core/filesystem/nsswitch.conf
index 6e459adb6..4a4f5770d 100644
--- a/core/filesystem/nsswitch.conf
+++ b/core/filesystem/nsswitch.conf
@@ -6,7 +6,7 @@ shadow: files
 
 publickey: files
 
-hosts: files dns
+hosts: files dns myhostname
 networks: files
 
 protocols: files
diff --git a/core/filesystem/shadow b/core/filesystem/shadow
index ccab68d33..5eff4935c 100644
--- a/core/filesystem/shadow
+++ b/core/filesystem/shadow
@@ -4,4 +4,5 @@ daemon:x:14871::::::
 mail:x:14871::::::
 ftp:x:14871::::::
 http:x:14871::::::
+uuidd:x:14871::::::
 nobody:x:14871::::::