diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index f3a0b3c..1259683 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -6,7 +6,7 @@
 # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
 pkgname=qubes-vm-core
 pkgver=`cat version`
-pkgrel=2
+pkgrel=4
 epoch=
 pkgdesc="The Qubes core files for installation inside a Qubes VM."
 arch=("x86_64")
diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install
index 58245f6..810af8a 100644
--- a/archlinux/PKGBUILD.install
+++ b/archlinux/PKGBUILD.install
@@ -198,6 +198,15 @@ systemctl daemon-reload
 
 }
 
+config_addlinetofile() {
+
+FILE=$1
+APPENDAFTERLINE=$2
+APPENDLINE=$3
+grep -q "$APPENDLINE" "$FILE" || sed "/$APPENDAFTERLINE/a$APPENDLINE" -i "$FILE"
+
+}
+
 update_finalize() {
 
 	# Archlinux specific: Update pam.d configuration for su to enable systemd-login wrapper
@@ -213,6 +222,13 @@ update_finalize() {
 	rm -f /etc/systemd/system/getty.target.wants/getty@tty*.service
 	systemctl enable getty\@tty1.service
 
+	# Archlinux specific: Prepare pacman.conf to add qubes specific config
+	QUBES_MARKER="### QUBES CONFIG MARKER ###"
+	config_addlinetofile "/etc/pacman.conf" "NoUpgrade" "$QUBES_MARKER"
+	
+	# Add Qubes setup script markers at the right place (this won't work at the end of pacman.conf)"
+	config_addlinetofile "/etc/pacman.conf "$QUBES_MARKER" "### QUBES BEGIN ###"
+	
 	systemctl daemon-reload
 }