diff --git a/akmods b/akmods
index 88dade4..d766d77 100644
--- a/akmods
+++ b/akmods
@@ -178,7 +178,7 @@ init ()
 	# if there are no akmod packages installed there is nothing to do for us
 	if ! ls /usr/src/akmods/*-kmod.latest &> /dev/null ; then
 		echo -n "No akmod packages found, nothing to do." >&2
-		echo_success; echo; exit 1
+		echo_success; echo; exit 0
 	fi
 
 
@@ -423,9 +423,8 @@ check_kmods()
 
 	# akmods for newly installed akmod rpms as wells as akmods.service run
 	# after udev and systemd-modules-load.service have tried to load modules
-	# trigger/restart both so that they may load the newly installed modules
 	if [[ "${somesucceeded}" ]] && [ ${this_kernelver} = "$(uname -r)" ]; then
-		udevadm trigger
+		find /sys/devices -name modalias -print0 | xargs -0 cat | xargs modprobe -a -b -q
 		systemctl restart systemd-modules-load.service
 	fi
 }
diff --git a/akmods.spec b/akmods.spec
index 2e312e7..54f5d53 100644
--- a/akmods.spec
+++ b/akmods.spec
@@ -1,6 +1,6 @@
 Name:           akmods
 Version:        0.5.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Automatic kmods build and install tool 
 
 License:        MIT
@@ -132,6 +132,12 @@ useradd -r -g akmods -d /var/cache/akmods/ -s /sbin/nologin \
 
 
 %changelog
+* Thu May  4 2017 Hans de Goede <hdegoede@redhat.com> - 0.5.6-7
+- "udevadm trigger" may have bad side-effects (rhbz#454407) instead
+  look for modalias files under /sys/devices and call modprobe directly
+- Fix exit status when no akmod packages are installed, so that systemd
+  does not consider the akmods.service as having failed to start
+
 * Wed May  3 2017 Hans de Goede <hdegoede@redhat.com> - 0.5.6-6
 - Run "udevadm trigger" and "systemctl restart systemd-modules-load.service"
   when new kmod packages have been build and installed so that the new