diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 0efc2e7..ea5b3d4 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -6,14 +6,14 @@
 # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
 pkgname=qubes-vm-core
 pkgver=`cat version`
-pkgrel=17
+pkgrel=18
 epoch=
 pkgdesc="The Qubes core files for installation inside a Qubes VM."
 arch=("x86_64")
 url="http://qubes-os.org/"
 license=('GPL')
 groups=()
-depends=(qubes-libvchan qubes-vm-utils)
+depends=(qubes-libvchan qubes-vm-utils imagemagick ntp zenity)
 makedepends=(qubes-vm-utils)
 checkdepends=()
 optdepends=()
@@ -96,6 +96,14 @@ package() {
   # Install systemd script allowing to automount /lib/modules
   install -m 644 $srcdir/PKGBUILD.qubes-ensure-lib-modules.service $pkgdir/lib/systemd/system/qubes-ensure-lib-modules.service
 
+  # Archlinux specific: enable autologin on tty1
+  mkdir -p $pkgdir/etc/systemd/system/getty@tty1.service.d/
+  cat <<EOF > $pkgdir/etc/systemd/system/getty@tty1.service.d/autologin.conf
+[Service]
+ExecStart=
+ExecStart=-/usr/bin/agetty --autologin user --noclear %I 38400 linux
+EOF
+
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install
index 10b6152..d5aafa1 100644
--- a/archlinux/PKGBUILD.install
+++ b/archlinux/PKGBUILD.install
@@ -97,6 +97,26 @@ done
 
 update_systemd() {
 
+echo "Updating systemd configuration for Qubes..."
+echo "Enabling tty1"
+# Archlinux specific: ensure tty1 is enabled
+rm -f /etc/systemd/system/getty.target.wants/getty\@tty*.service
+systemctl enable getty\@tty1.service
+
+echo "Fixing bug in xinitrc"
+# Archlinux specific: Fix potential bug in xinitrc making dbus to not initilize correctly
+sed 's:for f in /etc/X11/xinit/xinitrc.d/?\*\.sh:for f in /etc/X11/xinit/xinitrc.d/?\*:' -i /etc/X11/xinit/xinitrc
+
+# Archlinux specific: Update pam.d configuration for su to enable systemd-login wrapper
+if [ -z "`cat /etc/pam.d/su | grep system-login`" ] ; then
+	echo "Fixing pam.d"
+	sed '/auth\t\trequired\tpam_unix.so/aauth\t\tinclude\t\tsystem-login' -i /etc/pam.d/su
+	sed '/account\t\trequired\tpam_unix.so/aaccount\t\tinclude\t\tsystem-login' -i /etc/pam.d/su
+	sed '/session\t\trequired\tpam_unix.so/asession\t\tinclude\t\tsystem-login' -i /etc/pam.d/su
+	cp /etc/pam.d/su /etc/pam.d/su-l
+fi
+
+echo "Enabling qubes specific services"
 for srv in qubes-dvm qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network qubes-firewall qubes-yum-proxy qubes-qrexec-agent qubes-ensure-lib-modules; do
     systemctl enable $srv.service 2> /dev/null
 done
@@ -140,8 +160,6 @@ for srv in $DISABLE_SERVICES; do
     fi
 done
 
-rm -f /etc/systemd/system/getty.target.wants/getty@tty*.service
-
 # Enable some services
 systemctl enable iptables.service 2> /dev/null
 systemctl enable ip6tables.service 2> /dev/null
@@ -176,7 +194,6 @@ pre_install() {
 
   # Add qubes core related fstab entries
   echo "xen	/proc/xen	xenfs	defaults	0 0" >> /etc/fstab
-  echo "/dev/xvdi	/mnt/removable	auto	noauto,user,rw	0 0" >> /etc/fstab
 
   # Archlinux bash version has a 'bug' when running su -c, /etc/profile is not loaded because bash consider there is no interactive pty when running 'su - user -c' or something like this.
   # See https://bugs.archlinux.org/task/31831