diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 905003ea87..f3231bc0e4 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -37,6 +37,7 @@
 #include "pager.h"
 #include "parse-util.h"
 #include "process-util.h"
+#include "sigbus.h"
 #include "signal-util.h"
 #include "spawn-polkit-agent.h"
 #include "strv.h"
@@ -1589,6 +1590,7 @@ int main(int argc, char *argv[]) {
         setlocale(LC_ALL, "");
         log_parse_environment();
         log_open();
+        sigbus_install();
 
         r = parse_argv(argc, argv);
         if (r <= 0)
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index a6542d5a16..a44d75604a 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -52,15 +52,16 @@
 #include "path-util.h"
 #include "process-util.h"
 #include "ptyfwd.h"
+#include "sigbus.h"
 #include "signal-util.h"
 #include "spawn-polkit-agent.h"
+#include "stdio-util.h"
 #include "strv.h"
 #include "terminal-util.h"
 #include "unit-name.h"
 #include "util.h"
 #include "verbs.h"
 #include "web-util.h"
-#include "stdio-util.h"
 
 #define ALL_IP_ADDRESSES -1
 
@@ -3051,6 +3052,7 @@ int main(int argc, char*argv[]) {
         setlocale(LC_ALL, "");
         log_parse_environment();
         log_open();
+        sigbus_install();
 
         r = parse_argv(argc, argv);
         if (r <= 0)