diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 678a094..16ac594 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -6,7 +6,7 @@
 # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
 pkgname=(qubes-vm-utils qubes-vm-kernel-support)
 pkgver=`cat version`
-pkgrel=3
+pkgrel=4
 epoch=
 pkgdesc="Common Linux files for Qubes VM."
 arch=("x86_64")
@@ -28,7 +28,7 @@ changelog=
 source=(PKGBUILD-initcpio-hook.sh PKGBUILD-initcpio-install.sh PKGBUILD-qubes-prepare-vm-kernel.sh)
 
 noextract=()
-md5sums=(e88b50aed7d28087968da728ec1dc2b6 3d204b0d8acda9cf3ea5ebd5334a04d6 241686bcf643683cfa0249a56a5fa9be)
+md5sums=(e88b50aed7d28087968da728ec1dc2b6 3d204b0d8acda9cf3ea5ebd5334a04d6 76ffd56b376136d7ee44190a0531a4af)
 
 
 build() {
diff --git a/archlinux/PKGBUILD-qubes-prepare-vm-kernel.sh b/archlinux/PKGBUILD-qubes-prepare-vm-kernel.sh
index 47bc4b3..edabc88 100644
--- a/archlinux/PKGBUILD-qubes-prepare-vm-kernel.sh
+++ b/archlinux/PKGBUILD-qubes-prepare-vm-kernel.sh
@@ -29,6 +29,15 @@ function recompile_u2mfn() {
     kver=$1
     u2mfn_ver=`dkms status u2mfn|tail -n 1|cut -f 2 -d ' '|tr -d ':,'`
     if ! modinfo -k "$kver" -n u2mfn 2>&1 > /dev/null; then
+        echo "Module u2mfn not available. Checking available source to be built."
+        u2mfn_ver=`cat /usr/src/u2mfn-*/dkms.conf | grep PACKAGE_VERSION | cut -d "=" -f 2 | tr -d '"' | sort -u | head -n 1`
+        if [ -z "$u2mfn_ver" ] ; then
+            echo "No source found for u2mfn. Is qubes-vm-kernel-support installed correctly?"
+            return 1
+        else
+            echo "Found sources for u2mfn version $u2mfn_ver"
+        fi
+
         dkms install u2mfn/$u2mfn_ver -k $kver --no-initrd
     fi
 }