diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
new file mode 100644
index 0000000..f697816
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
@@ -0,0 +1,11 @@
+--- qemu-4.2.0/qga/commands-posix.c.orig	2020-03-23 11:15:05.972610989 +0300
++++ qemu-4.2.0/qga/commands-posix.c	2020-03-23 11:15:39.676015087 +0300
+@@ -108,7 +108,7 @@
+         reopen_fd_to_null(1);
+         reopen_fd_to_null(2);
+ 
+-        execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
++        execle("/sbin/shutdown", "shutdown", "-h", "now", shutdown_flag, "+0",
+                "hypervisor initiated shutdown", (char*)NULL, environ);
+         _exit(EXIT_FAILURE);
+     } else if (pid < 0) {
diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch
similarity index 80%
rename from app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch
rename to app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch
index 4d5690c..94b6a2c 100644
--- a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch
+++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-sysmacros.patch
@@ -4,8 +4,8 @@ Linux C libs are moving away from implicit header pollution with sys/types.h
 
 --- a/include/qemu/osdep.h
 +++ b/include/qemu/osdep.h
-@@ -78,6 +78,10 @@ extern int daemon(int, int);
- #include <assert.h>
+@@ -118,6 +118,10 @@ extern int daemon(int, int);
+ #include <setjmp.h>
  #include <signal.h>
  
 +#ifdef __linux__
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
similarity index 92%
rename from app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
rename to app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
index b07d11a..6400d0b 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -28,7 +28,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
+	"${FILESDIR}"/${PN}-4.2.0-sysmacros.patch #580924
+	"${FILESDIR}"/${PN}-4.2.0-fix-shutdown.patch #681874
 )
 
 src_configure() {