diff --git a/net-analyzer/gvmd/files/gvmd-9.0.0-disable_scap.patch b/net-analyzer/gvmd/files/gvmd-9.0.0-disable_scap.patch
new file mode 100644
index 000000000..8e9cd004c
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-9.0.0-disable_scap.patch
@@ -0,0 +1,11 @@
+--- a/src/manage.c.orig	2019-10-14 19:08:27.000000000 +0800
++++ b/src/manage.c	2019-10-30 10:38:56.089939734 +0800
+@@ -6832,7 +6832,7 @@
+              int (*fork_update_nvt_cache) ())
+ {
+   manage_sync_nvts (fork_update_nvt_cache);
+-  manage_sync_scap (sigmask_current);
++  /* manage_sync_scap (sigmask_current); */
+   manage_sync_cert (sigmask_current);
+ }
+ 
diff --git a/net-analyzer/gvmd/gvmd-9.0.0-r5.ebuild b/net-analyzer/gvmd/gvmd-9.0.0-r6.ebuild
similarity index 96%
rename from net-analyzer/gvmd/gvmd-9.0.0-r5.ebuild
rename to net-analyzer/gvmd/gvmd-9.0.0-r6.ebuild
index 1dcc5d7ea..1a5246c51 100644
--- a/net-analyzer/gvmd/gvmd-9.0.0-r5.ebuild
+++ b/net-analyzer/gvmd/gvmd-9.0.0-r6.ebuild
@@ -47,6 +47,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-tmplock.patch"
 	#https://github.com/greenbone/gsa/issues/1258
 	"${FILESDIR}/${P}-git.patch"
+	#https://github.com/greenbone/gvmd/issues/822
+	"${FILESDIR}/${P}-disable_scap.patch"
 )
 
 src_prepare() {
@@ -103,7 +105,7 @@ src_install() {
 
 	dodir /etc/gvm/sysconfig
 	insinto /etc/gvm/sysconfig
-	doins "${FILESDIR}/${PN}-daemon.conf"
+	doins "${FILESDIR}/${PN}-daemon9.conf"
 
 	exeinto /etc/gvm
 	doexe "${FILESDIR}"/gvmd-startpre.sh