diff -ru vlc-2.2.0.orig/modules/misc/inhibit/xdg.c vlc-2.2.0/modules/misc/inhibit/xdg.c
--- vlc-2.2.0.orig/modules/misc/inhibit/xdg.c	2015-02-28 08:48:24.264968381 -0200
+++ vlc-2.2.0/modules/misc/inhibit/xdg.c	2015-02-28 08:48:43.081636013 -0200
@@ -26,6 +26,7 @@
 #include <vlc_plugin.h>
 #include <vlc_inhibit.h>
 #include <assert.h>
+#include <errno.h>
 #include <signal.h>
 #include <spawn.h>
 #include <sys/wait.h>
@@ -65,7 +66,7 @@
     {
         int status;
 
-        while (waitpid (pid, &status, 0) == -1);
+        while (waitpid (pid, &status, 0) == -1 && errno != ECHILD);
     }
     else
         msg_Warn (ih, "error starting xdg-screensaver: %s",
diff -ru vlc-2.2.0.orig/modules/stream_filter/decomp.c vlc-2.2.0/modules/stream_filter/decomp.c
--- vlc-2.2.0.orig/modules/stream_filter/decomp.c	2015-02-28 08:48:24.264968381 -0200
+++ vlc-2.2.0/modules/stream_filter/decomp.c	2015-02-28 08:40:58.824945520 -0200
@@ -404,7 +404,7 @@
         return VLC_SUCCESS;
 
     if (p_sys->pid != -1)
-        while (waitpid (p_sys->pid, &(int){ 0 }, 0) == -1);
+        while (waitpid (p_sys->pid, &(int){ 0 }, 0) == -1 && errno != ECHILD);
     vlc_mutex_destroy (&p_sys->lock);
     vlc_cond_destroy (&p_sys->wait);
     free (p_sys);
@@ -429,7 +429,7 @@
         close (p_sys->write_fd);
 
     msg_Dbg (obj, "waiting for PID %u", (unsigned)p_sys->pid);
-    while (waitpid (p_sys->pid, &status, 0) == -1);
+    while (waitpid (p_sys->pid, &status, 0) == -1 && errno != ECHILD);
     msg_Dbg (obj, "exit status %d", status);
 
     if (p_sys->peeked)
diff -ru vlc-2.2.0.orig/src/posix/netconf.c vlc-2.2.0/src/posix/netconf.c
--- vlc-2.2.0.orig/src/posix/netconf.c	2015-02-28 08:48:24.264968381 -0200
+++ vlc-2.2.0/src/posix/netconf.c	2015-02-28 08:40:58.824945520 -0200
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <spawn.h>
 #include <unistd.h>
@@ -94,7 +95,7 @@
         while (len < sizeof (buf));
 
         close(fd[0]);
-        while (waitpid(pid, &(int){ 0 }, 0) == -1);
+        while (waitpid(pid, &(int){ 0 }, 0) == -1 && errno != ECHILD);
 
         if (len >= 9 && !strncasecmp(buf, "direct://", 9))
             return NULL;