2 files changed, 3 insertions, 3 deletions

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 62f5de8b6..4ccb76d95 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -751,7 +751,7 @@ static void action_modload(const struct devfsd_notify_struct *info,
         argv[4] = concat_path_file("/dev", info->devname); /* device */
         argv[5] = NULL;
 
-        wait4pid(xspawn(argv));
+        spawn_and_wait(argv);
         free(argv[4]);
 }  /*  End Function action_modload  */
 
@@ -783,7 +783,7 @@ static void action_execute(const struct devfsd_notify_struct *info,
                 argv[count] = largv[count];
         }
         argv[count] = NULL;
-        wait4pid(spawn(argv));
+        spawn_and_wait(argv);
 }   /*  End Function action_execute  */
 
 
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index 999b5e309..271f3ade1 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -155,7 +155,7 @@ int inotifyd_main(int argc, char **argv)
                                 args[1] = events;
                                 args[2] = watches[ie->wd];
                                 args[3] = ie->len ? ie->name : NULL;
-                                wait4pid(xspawn((char **)args));
+                                spawn_and_wait((char **)args);
                                 // we are done if all files got final x event
                                 if (ie->mask & 0x8000) {
                                         if (--argc <= 0)