diff --git a/ignition-suse-generator b/ignition-suse-generator
index 18195d3..cf89f83 100644
--- a/ignition-suse-generator
+++ b/ignition-suse-generator
@@ -24,10 +24,10 @@ EOF
 fi
 
 if [ -z "${PLATFORM_ID}" ]; then
-    platform="$(virt-what)"
+    platform="$(systemd-detect-virt)"
     case "${platform}" in
         *vmware*)     platform="vmware" ;;
-        *virtualbox*) platform="virtualbox" ;;
+        *oracle*)     platform="virtualbox" ;;
         *kvm*|*qemu*) platform="qemu" ;;
         *)            platform="metal" ;;
     esac
diff --git a/ignition.changes b/ignition.changes
index c137422..9744167 100644
--- a/ignition.changes
+++ b/ignition.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  3 15:04:30 UTC 2020 - Ignaz Forster <iforster@suse.com>
+
+- Change virtualization detection from virt-what to
+  systemd-detect-virt; this avoids a dependency to a hardcoded
+  libexec path in module-setup.sh (which broke during the recent
+  migration to /usr/libexec)
+
 -------------------------------------------------------------------
 Tue Aug 18 11:56:54 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/ignition.spec b/ignition.spec
index 1170231..0f533af 100644
--- a/ignition.spec
+++ b/ignition.spec
@@ -47,7 +47,6 @@ BuildRequires:  update-bootloader-rpm-macros
 BuildRequires:  golang(API) >= 1.12
 Requires:       %{name}-dracut-grub2
 Requires:       dracut
-Requires:       virt-what
 Recommends:     %{_sbindir}/groupadd
 Recommends:     %{_sbindir}/sgdisk
 Recommends:     %{_sbindir}/useradd
diff --git a/module-setup.sh b/module-setup.sh
index c3db3fb..0b54cf6 100644
--- a/module-setup.sh
+++ b/module-setup.sh
@@ -19,7 +19,7 @@ install() {
         "/usr/sbin/ignition-enable-network"
     inst_script "$moddir/ignition-setup-user-suse.sh" \
         "/usr/sbin/ignition-setup-user-suse"
-    inst_multiple awk virt-what /usr/lib/virt-what-cpuid-helper id which dmidecode
+    inst_multiple awk systemd-detect-virt
 }
 
 installkernel() {