diff --git a/profiles/desktop/package.mask b/profiles/desktop/package.mask
index aeffcae6..a1b455b9 100644
--- a/profiles/desktop/package.mask
+++ b/profiles/desktop/package.mask
@@ -4,6 +4,10 @@
 >=media-plugins/alsaequal-0.6-r1
 =dev-lisp/gcl-2.6.11 # long compilation time
 
+# Waiting for udev to be fully populated
+# udev-217,udev-init-scripts-27,openrc-0.12.4
+=sys-apps/kmod-18-r2
+
 # 310M Optimus: Calling firefox leads to load nvidia.ko
 ~x11-drivers/nvidia-drivers-334.21
 
diff --git a/profiles/server/package.mask b/profiles/server/package.mask
index 2d2ec3d9..ea3361ae 100644
--- a/profiles/server/package.mask
+++ b/profiles/server/package.mask
@@ -1,3 +1,7 @@
 >=media-plugins/caps-plugins-0.9.10 # brokes alsaequal
 >=media-plugins/alsaequal-0.6-r1
 =dev-python/routes-2.0 # blocks upgrade of sys-cluster/nova
+
+# Waiting for udev to be fully populated
+# udev-217,udev-init-scripts-27,openrc-0.12.4
+=sys-apps/kmod-18-r2