diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 24a387b..c19c404 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -71,7 +71,7 @@ package() {
 
   (cd qrexec; make install DESTDIR=$pkgdir SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib)
 
-  make install-vm DESTDIR=$pkgdir SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib DROPIN_DIR=usr/lib/systemd/system DIST=archlinux
+  make install-vm DESTDIR=$pkgdir SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib DROPIN_DIR=usr/lib/systemd DIST=archlinux
 
   # Remove things non wanted in archlinux
   rm -r $pkgdir/etc/yum*
diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install
index bb51d26..f5b6da4 100644
--- a/archlinux/PKGBUILD.install
+++ b/archlinux/PKGBUILD.install
@@ -135,7 +135,8 @@ EOF
 	    echo "LANG=en_US.UTF-8" >> /etc/locale.conf
 	fi
 	# ... and make sure it is really generated
-	current_locale=`grep LANG /etc/locale.conf|cut -f 2 -d =`
+	# This line is buggy as LANG can be set to LANG="en_US.UTF-8". The Quotes must be stripped
+	current_locale=`grep LANG /etc/locale.conf|cut -f 2 -d = | tr -d '"'`
 	if [ -n "$current_locale" ] && ! locale -a | grep -q "$current_locale"; then
 	    base=`echo "$current_locale" | cut -f 1 -d .`
 	    charmap=`echo "$current_locale.UTF-8" | cut -f 2 -d .`