diff --git a/README.md b/README.md
index 5e4a77b374..93505ee7d0 100644
--- a/README.md
+++ b/README.md
@@ -118,14 +118,6 @@ Native and cross compiler/linker flags are set per architecture in `common/build
 and `common/cross-profiles` respectively. Ideally those settings are good enough by default,
 and there's no need to set your own unless you know what you are doing.
 
-### Virtual packages
-
-The `etc/defaults.virtual` file contains the default replacements for virtual packages,
-used as dependencies in the source packages tree.
-
-If you want to customize those replacements, copy `etc/defaults.virtual` to `etc/virtual`
-and edit it accordingly to your needs.
-
 ### Directory hierarchy
 
 The following directory hierarchy is used with a default configuration file:
diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index b3292fd23f..8f96265f4b 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -17,17 +17,6 @@ setup_pkg_depends() {
         if [ -z "${_pkgdepname}" ]; then
             _pkgdepname="$($XBPS_UHELPER_CMD getpkgname ${_depname} 2>/dev/null)"
         fi
-        if [ -s ${XBPS_DISTDIR}/etc/virtual ]; then
-            _replacement=$(egrep "^${_pkgdepname:-${_depname}}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2)
-            if [ -n "${_replacement}" ]; then
-                _depname="${_depname/${_pkgdepname:-${_depname}}/${_replacement}}"
-            fi
-        elif [ -s ${XBPS_DISTDIR}/etc/defaults.virtual ]; then
-            _replacement=$(egrep "^${_pkgdepname:-${_depname}}[[:blank:]]" ${XBPS_DISTDIR}/etc/defaults.virtual|cut -d ' ' -f2)
-            if [ -n "${_replacement}" ]; then
-                _depname="${_depname/${_pkgdepname:-${_depname}}/${_replacement}}"
-            fi
-        fi
         if [ -z "${_pkgdepname}" ]; then
             _pkgdep="${_depname}>=0"
         else
@@ -42,33 +31,11 @@ setup_pkg_depends() {
     done
     for j in ${hostmakedepends}; do
         _depname="${j%\?*}"
-        if [ -s ${XBPS_DISTDIR}/etc/virtual ]; then
-            _replacement=$(egrep "^${_depname}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2)
-            if [ -n "${_replacement}" ]; then
-                _depname="${_depname/${_depname}/${_replacement}}"
-            fi
-        elif [ -s ${XBPS_DISTDIR}/etc/defaults.virtual ]; then
-            _replacement=$(egrep "^${_depname}[[:blank:]]" ${XBPS_DISTDIR}/etc/defaults.virtual|cut -d ' ' -f2)
-            if [ -n "${_replacement}" ]; then
-                _depname="${_depname/${_depname}/${_replacement}}"
-            fi
-        fi
         _depver=$(srcpkg_get_version ${_depname}) || exit $?
         host_build_depends+=" ${_depname}-${_depver}"
     done
     for j in ${makedepends}; do
         _depname="${j%\?*}"
-        if [ -s ${XBPS_DISTDIR}/etc/virtual ]; then
-            _replacement=$(egrep "^${_depname}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2)
-            if [ -n "${_replacement}" ]; then
-                _depname="${_depname/${_depname}/${_replacement}}"
-            fi
-        elif [ -s ${XBPS_DISTDIR}/etc/defaults.virtual ]; then
-            _replacement=$(egrep "^${_depname}[[:blank:]]" ${XBPS_DISTDIR}/etc/defaults.virtual|cut -d ' ' -f2)
-            if [ -n "${_replacement}" ]; then
-                _depname="${_depname/${_depname}/${_replacement}}"
-            fi
-        fi
         _depver=$(srcpkg_get_version ${_depname}) || exit $?
         build_depends+=" ${_depname}-${_depver}"
     done
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
deleted file mode 100644
index a08e2b9377..0000000000
--- a/etc/defaults.virtual
+++ /dev/null
@@ -1,22 +0,0 @@
-# --*-- shell --*--
-#
-# etc/defaults.virtual
-#	default configuration of etc/virtual
-#
-# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING UPDATES,
-# EDIT etc/virtual INSTEAD.
-#
-# This file specifies a mapping between virtual packages and real packages
-# available in the source packages collection (srcpkgs).
-#
-# The format uses 2 arguments delimited by a blank: <vpkgname> <realpkgname>
-#
-# If a source package depends on a virtual package (<vpkgname>) and there's
-# a replacement defined in that file, <realpkgname> will be used to resolve
-# the dependency instead.
-#
-# - Create your own etc/virtual file to override these defaults.
-#
-libudev-devel eudev-libudev-devel
-ConsoleKit-devel ConsoleKit2-devel
-libressl-openssl libressl
diff --git a/srcpkgs/ConsoleKit2/template b/srcpkgs/ConsoleKit2/template
index 781e3eb89f..898922ce6f 100644
--- a/srcpkgs/ConsoleKit2/template
+++ b/srcpkgs/ConsoleKit2/template
@@ -7,7 +7,7 @@ configure_args="ac_cv_file__sys_class_tty_tty0_active=yes
  --with-rundir=/run --enable-udev-acl --enable-pam-module
  --with-pam-module-dir=/usr/lib/security"
 hostmakedepends="git automake libtool pkg-config gettext-devel glib-devel"
-makedepends="acl-devel libudev-devel polkit-devel glib-devel libX11-devel pam-devel libcgmanager-devel"
+makedepends="acl-devel eudev-libudev-devel polkit-devel glib-devel libX11-devel pam-devel libcgmanager-devel"
 depends="dbus cgmanager"
 short_desc="A framework for defining and tracking users, login sessions, and seats"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b45567577c..2738c817d7 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -7,7 +7,7 @@ configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
  --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
  --disable-alsa-shared --disable-pulseaudio-shared --enable-dbus"
 hostmakedepends="pkg-config nasm"
-makedepends="alsa-lib-devel dbus-devel libudev-devel libusb-compat-devel"
+makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel"
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.libsdl.org/"
diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 3d20df5a1f..5192340458 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 only_for_archs="armv7l armv7l-musl"
-hostmakedepends="git perl kmod uboot-mkimage libressl-openssl bc"
+hostmakedepends="git perl kmod uboot-mkimage libressl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 5d883a917e..9ac824195f 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-pie --enable-threads --enable-library"
 hostmakedepends="automake libtool pkg-config flex"
-makedepends="libglib-devel libudev-devel dbus-devel
+makedepends="libglib-devel eudev-libudev-devel dbus-devel
  cups-devel libical-devel readline-devel"
 conf_files="/etc/bluetooth/main.conf"
 short_desc="Bluetooth tools and daemons"
diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template
index 0f7fc375e3..00f1c8c16c 100644
--- a/srcpkgs/cgminer/template
+++ b/srcpkgs/cgminer/template
@@ -8,7 +8,7 @@ configure_args="
  --enable-cointerra --enable-drillbit --enable-hashfast --enable-hashratio \
  --enable-icarus --enable-klondike --with-system-libusb"
 hostmakedepends="pkg-config automake libtool yasm"
-makedepends="libcurl-devel libusb-devel jansson-devel libudev-devel ncurses-devel"
+makedepends="libcurl-devel libusb-devel jansson-devel eudev-libudev-devel ncurses-devel"
 conf_files="/etc/cgminer.conf"
 short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 9164f9647e..50e5ff450a 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -23,7 +23,7 @@ checksum=8249c4cbe5a57cdc98c851a1322390b07a011834bb910c5a42f9040f03cdd700
 
 hostmakedepends="pkg-config intltool docbook2x gobject-introspection"
 makedepends="vala-devel libgudev-devel polkit-devel lcms2-devel dbus-devel
- libusb-devel libgusb-devel sqlite-devel sane-devel libudev-devel bash-completion"
+ libusb-devel libgusb-devel sqlite-devel sane-devel eudev-libudev-devel bash-completion"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gettext-devel glib-devel gtk-doc colord"
@@ -56,7 +56,7 @@ libcolord_package() {
 	}
 }
 colord-devel_package() {
-	depends="dbus-devel libglib-devel lcms2-devel libudev-devel libcolord>=${version}_${revision}"
+	depends="dbus-devel libglib-devel lcms2-devel eudev-libudev-devel libcolord>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index a08ce15b62..196c5fc838 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=3
 _dbname=wireless-regdb
 _dbversion=2015.01.30
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl-openssl python python-M2Crypto pkg-config"
+hostmakedepends="libressl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 60792a72e2..3250c9f99a 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -6,7 +6,7 @@ lib32disabled=yes
 build_style=configure
 configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run"
 hostmakedepends="ntp pkg-config"
-makedepends="libudev-devel"
+makedepends="eudev-libudev-devel"
 conf_files="/etc/dhcpcd.conf"
 short_desc="RFC2131 compliant DHCP client"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 7d903cd942..6f4ed35642 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -9,7 +9,7 @@ configure_args="CXX= --enable-multisense --enable-image-loader-webp
 hostmakedepends="pkg-config"
 makedepends="libressl-devel glib-devel libjpeg-turbo-devel fontconfig-devel
  fribidi-devel giflib-devel libpng-devel tiff-devel libwebp-devel
- gst-plugins-base1-devel avahi-libs-devel libudev-devel bullet-devel
+ gst-plugins-base1-devel avahi-libs-devel eudev-libudev-devel bullet-devel
  alsa-lib-devel libsndfile-devel libmount-devel LuaJIT-devel
  $(vopt_if harfbuzz harfbuzz-devel) $(vopt_if pulseaudio pulseaudio-devel)"
 homepage="http://enlightenment.org"
diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template
index 02e116229f..b09bf25dc4 100644
--- a/srcpkgs/geoclue2/template
+++ b/srcpkgs/geoclue2/template
@@ -7,7 +7,7 @@ wrksrc="geoclue-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --with-dbus-service-user=geoclue2"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="libudev-devel json-glib-devel libsoup-gnome-devel ModemManager-devel"
+makedepends="eudev-libudev-devel json-glib-devel libsoup-gnome-devel ModemManager-devel"
 depends="libsoup>=2.44"
 # Run the daemon under an unprileged user.
 system_accounts="geoclue2"
diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 4baefe7242..659cddcefc 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -16,7 +16,7 @@ checksum="03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029"
 system_accounts="gpsd"
 
 hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc ncurses"
-makedepends="libudev-devel ntp libusb-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel"
+makedepends="eudev-libudev-devel ntp libusb-devel ncurses-devel pps-tools-devel libcap-devel libbluetooth-devel"
 
 subpackages="gpsd-devel"
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index 0c29b2d7ec..7e72d1b569 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname}-src-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --disable-debian-menu"
 hostmakedepends="pkg-config intltool"
-makedepends="libudev-devel gtk+3-devel SDL2-devel ffmpeg-devel libusb-devel
+makedepends="eudev-libudev-devel gtk+3-devel SDL2-devel ffmpeg-devel libusb-devel
  pulseaudio-devel v4l-utils-devel portaudio-devel gsl-devel"
 depends="desktop-file-utils"
 short_desc="Simple GTK interface for capturing and viewing video from UVC devices"
diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template
index fcd4ad1bc7..d9d2985b17 100644
--- a/srcpkgs/hidapi/template
+++ b/srcpkgs/hidapi/template
@@ -7,7 +7,7 @@ revision=1
 wrksrc="${pkgname}-${pkgname}-${_distver}-${_patchver}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libudev-devel libusb-devel"
+makedepends="eudev-libudev-devel libusb-devel"
 short_desc="A Simple library for communicating with USB and Bluetooth HID devices"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="3-clause-BSD"
diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index c8ede2d2ac..d3182913f3 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -4,7 +4,7 @@ version=1.11.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="cairo-devel ncurses-devel libxml2-devel libudev-devel"
+makedepends="cairo-devel ncurses-devel libxml2-devel eudev-libudev-devel"
 case "$XBPS_TARGET_ARCH" in
 	i686*|x86_64*) makedepends+=" libnuma-devel";;
 esac
diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template
index e338517712..8960268150 100644
--- a/srcpkgs/kde-workspace/template
+++ b/srcpkgs/kde-workspace/template
@@ -27,7 +27,7 @@ makedepends="libressl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-de
  libXtst-devel libXft-devel glib-devel fontconfig-devel kdepimlibs-devel
  libsensors-devel wayland-devel MesaLib-devel pam-devel libusb-compat-devel
  NetworkManager-devel pciutils-devel libraw1394-devel python-devel libqalculate-devel
- akonadi-devel qjson-devel ConsoleKit-devel"
+ akonadi-devel qjson-devel ConsoleKit2-devel"
 depends="kde-wallpapers>=${_kdeversion} kde-base-artwork>=${_kdeversion}"
 conf_files="
 	/etc/kdm/kdmrc
diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template
index d00c3f4caf..d482ee13ce 100644
--- a/srcpkgs/kdelibs/template
+++ b/srcpkgs/kdelibs/template
@@ -19,7 +19,7 @@ hostmakedepends="cmake perl automoc4 pkg-config docbook-xsl"
 makedepends="libressl-devel libSM-devel libXext-devel libXScrnSaver-devel
  libXrender-devel phonon-devel strigi-devel pcre-devel libjpeg-turbo-devel
  libpng-devel giflib-devel acl-devel enchant-devel jasper-devel
- liblzma-devel mit-krb5-devel avahi-libs-devel libudev-devel libxslt-devel
+ liblzma-devel mit-krb5-devel avahi-libs-devel eudev-libudev-devel libxslt-devel
  polkit-qt-devel libdbusmenu-qt-devel attica-devel grantlee-devel qca-devel
  libutempter-devel MesaLib-devel udisks2-devel
  libopenexr-devel media-player-info shared-mime-info shared-desktop-ontologies"
diff --git a/srcpkgs/kirkwood-kernel/template b/srcpkgs/kirkwood-kernel/template
index e6cd9a368d..75eae9c739 100644
--- a/srcpkgs/kirkwood-kernel/template
+++ b/srcpkgs/kirkwood-kernel/template
@@ -25,7 +25,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 only_for_archs="armv5tel armv5tel-musl"
-hostmakedepends="perl kmod uboot-mkimage libressl-openssl bc"
+hostmakedepends="perl kmod uboot-mkimage libressl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 740e3529f1..212ddf4341 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--disable-static --disable-multi-seat"
 hostmakedepends="pkg-config docbook-xsl xkeyboard-config"
 makedepends="MesaLib-devel pango-devel libtsm-devel libxkbcommon-devel
- libpciaccess-devel libudev-devel dbus-devel fuse-devel"
+ libpciaccess-devel eudev-libudev-devel dbus-devel fuse-devel"
 depends="xkeyboard-config"
 short_desc="Terminal emulator based on Kernel Mode Setting (KMS)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index 8769cdc3b4..8cd5232a4f 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -20,7 +20,7 @@ hostmakedepends="
  gettext-devel libltdl-devel python-devel libmysqlclient-devel
  SDL2_image-devel lzo-devel swig"
 makedepends="
- libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
+ eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
  avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel
  libmpeg2-devel wavpack-devel zlib-devel lzo-devel fribidi-devel sqlite-devel freetype-devel
  jasper-devel faac-devel faad2-devel libmodplug-devel libressl-devel libass-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 31edbf6ae5..c49ab1b34b 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -24,7 +24,7 @@ hostmakedepends="
  automake libtool pkg-config gperf cmake zip unzip nasm yasm python-devel
  gettext-devel libltdl-devel curl"
 makedepends="
- libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
+ eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
  libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
  libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
diff --git a/srcpkgs/ldm/template b/srcpkgs/ldm/template
index 814ab23c03..75fc8f1204 100644
--- a/srcpkgs/ldm/template
+++ b/srcpkgs/ldm/template
@@ -3,7 +3,7 @@ pkgname=ldm
 version=0.7
 revision=1
 hostmakedepends="perl pkg-config"
-makedepends="libmount-devel libudev-devel libglib-devel"
+makedepends="libmount-devel eudev-libudev-devel libglib-devel"
 short_desc="A lightweight device mounter"
 maintainer='Juan RP <xtraeme@voidlinux.eu>'
 license="MIT"
diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index c1d2516cc7..d2f956bec0 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -19,7 +19,7 @@ hostmakedepends="
  automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel"
 makedepends="
  glproto dri2proto dri3proto presentproto libXext-devel libXxf86vm-devel
- libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel libva-devel
+ eudev-libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel libva-devel
  libXdamage-devel libXvMC-devel libxshmfence-devel wayland-devel
  elfutils-devel ncurses-devel zlib-devel libffi-devel libressl-devel"
 conf_files="/etc/drirc"
diff --git a/srcpkgs/libatasmart/template b/srcpkgs/libatasmart/template
index 6b0ecccbfe..1f2859d205 100644
--- a/srcpkgs/libatasmart/template
+++ b/srcpkgs/libatasmart/template
@@ -5,7 +5,7 @@ revision=4
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-static"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libudev-devel"
+makedepends="eudev-libudev-devel"
 short_desc="ATA S.M.A.R.T. Reading and Parsing Library"
 homepage="http://0pointer.de/blog/projects/being-smart.html"
 license="LGPL-2.1"
diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template
index 5f2224ed85..ffbc5651c4 100644
--- a/srcpkgs/libcanberra/template
+++ b/srcpkgs/libcanberra/template
@@ -9,7 +9,7 @@ hostmakedepends="automake libtool gettext-devel pkg-config intltool"
 makedepends="
  gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel
  gstreamer1-devel alsa-lib-devel tdb-devel pulseaudio-devel
- libudev-devel vala-devel"
+ eudev-libudev-devel vala-devel"
 short_desc="XDG Sound Theme and Name Specification library implementation"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://0pointer.de/lennart/projects/libcanberra/"
diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index 456cab9a85..b74c9de1bb 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 hostmakedepends="cmake pkg-config libtool swig"
-makedepends="libudev-devel lockdev-devel p8-platform-devel libXrandr-devel
+makedepends="eudev-libudev-devel lockdev-devel p8-platform-devel libXrandr-devel
  lockdev-devel python-devel"
 short_desc="USB CEC Adapter communication Library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -43,7 +43,7 @@ cec-client_package() {
 }
 libcec-devel_package() {
 	short_desc+=" - development files"
-	depends="libudev-devel p8-platform-devel libcec>=${version}_${revision}"
+	depends="eudev-libudev-devel p8-platform-devel libcec>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index d32c7dd4ef..7795f2ef70 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-udev --disable-valgrind"
 hostmakedepends="libtool automake pkg-config xorg-util-macros"
-makedepends="libudev-devel libpciaccess-devel"
+makedepends="eudev-libudev-devel libpciaccess-devel"
 short_desc="Userspace interface to kernel DRM services"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://dri.freedesktop.org/"
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index f6c9ee76d7..6711ebf989 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -4,7 +4,7 @@ version=1.2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="mtdev-devel libudev-devel libevdev-devel libwacom-devel"
+makedepends="mtdev-devel eudev-libudev-devel libevdev-devel libwacom-devel"
 short_desc="Provides handling input devices in Wayland compositors and X"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT"
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index ac9b7b2bca..853eabd2cb 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -4,7 +4,7 @@ version=1.0.20
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libudev-devel"
+makedepends="eudev-libudev-devel"
 short_desc="A library which allows userspace access to USB devices"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1"
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 17dce51d35..b46d643ce0 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -20,7 +20,7 @@ hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
  iptables libxslt docbook-xsl dnsmasq"
 makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel
  gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel
- libparted-devel device-mapper-devel dbus-devel libudev-devel libblkid-devel
+ libparted-devel device-mapper-devel dbus-devel eudev-libudev-devel libblkid-devel
  libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel
  python-devel libssh2-devel libcap-ng-devel fuse-devel libtirpc-devel"
 depends="ebtables dnsmasq"
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 58cfe1bab9..435ae36453 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -8,7 +8,7 @@ short_desc="Linux kernel tools meta-pkg"
 hostmakedepends="flex perl asciidoc xmlto python automake libtool"
 makedepends="pciutils-devel python-devel libglib-devel libsysfs-devel
  elfutils-devel libunwind-devel binutils-devel zlib-devel slang-devel
- libudev-devel"
+ eudev-libudev-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
diff --git a/srcpkgs/mdadm/template b/srcpkgs/mdadm/template
index 797091f185..8cc2c58912 100644
--- a/srcpkgs/mdadm/template
+++ b/srcpkgs/mdadm/template
@@ -3,7 +3,7 @@ pkgname=mdadm
 version=3.4
 revision=1
 hostmakedepends="pkg-config"
-makedepends="libudev-devel"
+makedepends="eudev-libudev-devel"
 short_desc="Tool for managing/monitoring Linux md device arrays"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-2"
diff --git a/srcpkgs/media-player-info/template b/srcpkgs/media-player-info/template
index a89b17e0b1..e0b6cb0e2e 100644
--- a/srcpkgs/media-player-info/template
+++ b/srcpkgs/media-player-info/template
@@ -5,7 +5,7 @@ revision=1
 noarch=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config python3.4"
-makedepends="libudev-devel"
+makedepends="eudev-libudev-devel"
 homepage="http://cgit.freedesktop.org/$pkgname/"
 short_desc="Data files describing media player capabilities, for post-HAL systems"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index f8cd4dbc5f..fb9718d643 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -14,7 +14,7 @@ build_style=configure
 nocross=yes
 
 hostmakedepends="pkg-config yasm"
-makedepends="videoproto libudev-devel libpng-devel libass-devel
+makedepends="videoproto eudev-libudev-devel libpng-devel libass-devel
  libvorbis-devel SDL_image-devel x264-devel jack-devel samba-devel
  mpg123-devel xcb-util-devel xcb-util-keysyms-devel libsamplerate-devel
  libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel
diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 8b54ca49a2..778e53f721 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 only_for_archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl-openssl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"
diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template
index 4464df960e..8c6cdbe013 100644
--- a/srcpkgs/openjdk/template
+++ b/srcpkgs/openjdk/template
@@ -26,7 +26,7 @@ configure_args="
  $(vopt_if oracle_bootstrap --with-boot-jdk=/usr/lib/jvm/oracle-jdk \
 			    --with-boot-jdk=/usr/lib/jvm/openjdk)"
 make_build_args="DEBUG_BINARIES=true docs all"
-hostmakedepends="pkg-config cpio unzip zip ca-certificates libressl-openssl"
+hostmakedepends="pkg-config cpio unzip zip ca-certificates libressl"
 case "$XBPS_MACHINE" in
 	arm*) hostmakedepends+=" $(vopt_if oracle_bootstrap oracle-jdk-arm openjdk)";;
 	*) hostmakedepends+=" $(vopt_if oracle_bootstrap oracle-jdk openjdk)";;
diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template
index a3c4fdc135..2f78af4873 100644
--- a/srcpkgs/openobex/template
+++ b/srcpkgs/openobex/template
@@ -5,7 +5,7 @@ revision=6
 wrksrc="${pkgname}-${version}-Source"
 build_style=cmake
 hostmakedepends="pkg-config cmake libxslt docbook-xsl"
-makedepends="libusb-devel libbluetooth-devel libudev-devel"
+makedepends="libusb-devel libbluetooth-devel eudev-libudev-devel"
 replaces="libopenobex>=0"
 short_desc="OBEX protocol implementation"
 homepage="http://dev.zuckschwerdt.org/openobex/"
diff --git a/srcpkgs/pcsc-acsccid/template b/srcpkgs/pcsc-acsccid/template
index 3cc787788d..6d387ceec7 100644
--- a/srcpkgs/pcsc-acsccid/template
+++ b/srcpkgs/pcsc-acsccid/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname/pcsc-/}-${version}"
 build_style=gnu-configure
 configure_args="--enable-udev"
 hostmakedepends="pkg-config flex perl"
-makedepends="pcsclite-devel libudev-devel libusb-compat-devel"
+makedepends="pcsclite-devel eudev-libudev-devel libusb-compat-devel"
 depends="pcsclite"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://acsccid.sourceforge.net"
diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template
index 30dc88492c..9703ba7d09 100644
--- a/srcpkgs/pcsc-ccid/template
+++ b/srcpkgs/pcsc-ccid/template
@@ -6,7 +6,7 @@ wrksrc=ccid-${version}
 build_style=gnu-configure
 configure_args="--enable-udev"
 hostmakedepends="pkg-config perl"
-makedepends="pcsclite-devel libudev-devel libusb-compat-devel"
+makedepends="pcsclite-devel eudev-libudev-devel libusb-compat-devel"
 short_desc="PC/SC driver to support CCID compliant readers"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1"
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 2042011082..7bf874997d 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -10,7 +10,7 @@ license="2-clause-BSD"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 configure_args="--enable-libudev --sbindir=/usr/bin"
 hostmakedepends="intltool pkg-config python"
-makedepends="libudev-devel libusb-devel python-devel"
+makedepends="eudev-libudev-devel libusb-devel python-devel"
 depends="python"
 distfiles="https://alioth.debian.org/frs/download.php/file/4164/pcsc-lite-${version}.tar.bz2"
 checksum=e7d08aa38897e86fdf632d56ac70663a3a9add3c0bf4031dc32e783f19c0688a
diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index a84bc829ff..60d831d7ba 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,7 +4,7 @@ version=1.72
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl-openssl"
+hostmakedepends="perl libressl"
 makedepends="perl zlib-devel libressl-devel"
 depends="perl"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index e38aaba106..63374daffe 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -11,7 +11,7 @@ configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --with-bash-completion-dir=/usr/share/bash-completion/completions"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel orc-devel"
 makedepends="
- zlib-devel libltdl-devel libglib-devel libudev-devel speex-devel libXi-devel
+ zlib-devel libltdl-devel libglib-devel eudev-libudev-devel speex-devel libXi-devel
  libXtst-devel xcb-util-devel libsndfile-devel libasyncns-devel
  dbus-devel tdb-devel libcap-devel avahi-libs-devel libressl-devel
  webrtc-audio-processing-devel json-c-devel orc-devel jack-devel fftw-devel
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 8748c773c8..a6aa21e4c5 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -12,7 +12,7 @@ configure_args="--prefix=/usr --global-config-dir=/etc --enable-udev
  $(vopt_enable sdl2) $(vopt_enable x11)"
 hostmakedepends="pkg-config python unzip"
 makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel libudev-devel $(vopt_if opengl MesaLib-devel)
+ alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
  $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index b1534b0491..37ecb69a84 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -23,7 +23,7 @@ noshlibprovides=yes
 
 # RPi and RPi2
 only_for_archs="armv6l armv6l-musl armv7l armv7l-musl"
-hostmakedepends="perl kmod uboot-mkimage libressl-openssl bc"
+hostmakedepends="perl kmod uboot-mkimage libressl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.
diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index f1cfce82f9..68b18fa104 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 conf_files="/etc/spacefm/spacefm.conf"
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+-devel startup-notification-devel libudev-devel ffmpegthumbnailer-devel"
+makedepends="gtk+-devel startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/steamos-compositor/template b/srcpkgs/steamos-compositor/template
index a593e3e2c7..3cff304e2f 100644
--- a/srcpkgs/steamos-compositor/template
+++ b/srcpkgs/steamos-compositor/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="libXxf86vm-devel libXrender-devel libXcomposite-devel
  libXdamage-devel libXpm-devel libSM-devel MesaLib-devel
- SDL_image-devel libudev-devel"
+ SDL_image-devel eudev-libudev-devel"
 short_desc="The SteamOS Compositor"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 7641193a8a..978e9d31c1 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -26,7 +26,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 only_for_archs="armv7l armv7l-musl"
-hostmakedepends="perl python kmod uboot-mkimage libressl-openssl bc"
+hostmakedepends="perl python kmod uboot-mkimage libressl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.
diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 3cb1ee4897..7c2e7bfce1 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 configure_args="--disable-systemd"
-makedepends="libglib-devel libudev-devel"
+makedepends="libglib-devel eudev-libudev-devel"
 conf_files="/etc/udevil/udevil.conf"
 short_desc="CLI which mounts and unmounts removable devices without a password"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/usbarmory-kernel/template b/srcpkgs/usbarmory-kernel/template
index 1a450a11d1..27eaa499d2 100644
--- a/srcpkgs/usbarmory-kernel/template
+++ b/srcpkgs/usbarmory-kernel/template
@@ -19,7 +19,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 only_for_archs="armv7l armv7l-musl"
-hostmakedepends="perl kmod uboot-mkimage libressl-openssl bc"
+hostmakedepends="perl kmod uboot-mkimage libressl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 
diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template
index 1516073a57..4fd52402fa 100644
--- a/srcpkgs/usbutils/template
+++ b/srcpkgs/usbutils/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/hwdata --disable-zlib"
 hostmakedepends="pkg-config"
-makedepends="libusb-devel libudev-devel"
+makedepends="libusb-devel eudev-libudev-devel"
 depends="hwids"
 homepage="http://linux-usb.sourceforge.net/"
 short_desc="Linux USB utilities"
diff --git a/srcpkgs/v8/template b/srcpkgs/v8/template
index dddd5a90e2..72fe6cc3e8 100644
--- a/srcpkgs/v8/template
+++ b/srcpkgs/v8/template
@@ -16,7 +16,7 @@ case "${XBPS_TARGET_MACHINE}" in
         x86_64*) _target="x64";;
         i686*) _target="ia32";;
         arm*) _target="arm"; _opts="hardfp=on snapshot=off";;
-        *) msg_error "$pkgver: unknown target architecture!\n" ;;
+        *) msg_error "$pkgname: unknown target architecture!\n" ;;
 esac
 
 do_build() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index c1bf7c997a..cba5a684ac 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -20,7 +20,7 @@ lib32disabled=yes
 
 # XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2).
 hostmakedepends="automake libtool pkg-config libgcrypt-devel $(vopt_if lua lua52)"
-makedepends="videoproto libudev-devel libpng-devel libupnp-devel
+makedepends="videoproto eudev-libudev-devel libpng-devel libupnp-devel
  ncurses-devel libvorbis-devel x264-devel ffmpeg-devel
  xcb-util-devel xcb-util-keysyms-devel libsamplerate-devel
  libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 231609f4ab..84576d7c6c 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -20,7 +20,7 @@ lib32disabled=yes
 hostmakedepends="pkg-config wayland-devel wayland-protocols autoconf automake libtool"
 makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel
  pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel
- poppler-glib-devel pam-devel lcms2-devel libudev-devel libdrm-devel
+ poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel
  libinput-devel libxcb-devel libXcursor-devel colord-devel
  $(vopt_if backtrace libunwind-devel) $(vopt_if dbus dbus-devel)
  $(vopt_if vaapi libva-devel)"
diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template
index 5c3e2c5c88..486872722e 100644
--- a/srcpkgs/xboxdrv/template
+++ b/srcpkgs/xboxdrv/template
@@ -4,7 +4,7 @@ version=0.8.8
 revision=1
 build_style=scons
 hostmakedepends="scons unzip pkg-config glib-devel dbus-glib-devel"
-makedepends="boost-devel libX11-devel libudev-devel libusb-devel dbus-glib-devel glib-devel"
+makedepends="boost-devel libX11-devel eudev-libudev-devel libusb-devel dbus-glib-devel glib-devel"
 short_desc="Xbox Gamepad Userspace Driver"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="GPL-3"
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 0b48c80f2c..f4fcb0d92c 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -6,7 +6,7 @@ lib32disabled=yes
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xf86driproto libudev-devel libpciaccess-devel
+makedepends="xf86driproto eudev-libudev-devel libpciaccess-devel
  libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-20_1 mesa-ati-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template
index f10b18a8d2..058cd741e3 100644
--- a/srcpkgs/xf86-video-ati/template
+++ b/srcpkgs/xf86-video-ati/template
@@ -7,7 +7,7 @@ only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 build_style=gnu-configure
 configure_args="--enable-glamor"
 hostmakedepends="pkg-config"
-makedepends="xf86driproto libudev-devel libpciaccess-devel
+makedepends="xf86driproto eudev-libudev-devel libpciaccess-devel
  libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-20_1 mesa-ati-dri"
 short_desc="Xorg ATI Radeon video driver"
diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index 8a6903b855..db91db163b 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -5,7 +5,7 @@ revision=1
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="git automake libtool pkg-config xorg-util-macros"
-makedepends="libudev-devel libdrm-devel libpciaccess-devel libXext-devel
+makedepends="eudev-libudev-devel libdrm-devel libpciaccess-devel libXext-devel
  libXfixes-devel libXv-devel libXvMC-devel xcb-util-devel MesaLib-devel
  xorg-server-devel"
 depends="virtual?xserver-abi-video-20_1 mesa-intel-dri"
diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index 2bb58c0e01..8649829356 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -6,7 +6,7 @@ lib32disabled=yes
 build_style=gnu-configure
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 hostmakedepends="pkg-config"
-makedepends="libudev-devel libdrm-devel xorg-server-devel"
+makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-20_1 mesa-nouveau-dri"
 short_desc="Xorg opensource NVIDIA video driver"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 367c6a58be..6bbc5b2a53 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -28,7 +28,7 @@ makedepends="
  damageproto inputproto glproto xproto presentproto
  dri2proto dri3proto xf86driproto randrproto videoproto compositeproto scrnsaverproto
  resourceproto xineramaproto xcmiscproto bigreqsproto xcb-util-devel
- xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel libudev-devel
+ xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel eudev-libudev-devel
  libressl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
  libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
  libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel