diff --git a/common/shlibs b/common/shlibs
index ecaf9c0c35..5cdd201d21 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3024,7 +3024,6 @@ libsysprof-ui-2.so sysprof-3.24.1_1
 libmozjs-52.so mozjs52-52.3.0_1
 libmozjs-52.so.0 mozjs52-52.3.0_1
 libvala-0.40.so.0 libvala-0.40.2_1
-libvaladoc-0.40.so.0 libvala-0.40.2_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
 libtracker-miner-2.0.so.0 libtracker-2.0.1_1
diff --git a/srcpkgs/vala/patches/fix-cross.patch b/srcpkgs/vala/patches/fix-cross.patch
deleted file mode 100644
index f1c73c1ca3..0000000000
--- a/srcpkgs/vala/patches/fix-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac.orig	2017-10-06 09:45:08.321772985 +0200
-+++ configure.ac	2017-10-06 09:46:58.900866875 +0200
-@@ -104,16 +104,15 @@ cgraph_tmp_LIBADD="$LIBADD"
- cgraph_tmp_CFLAGS="$CFLAGS"
- LIBADD="$LIBADD $LIBGVC_LIBS"
- CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
--AC_RUN_IFELSE(
-+AC_COMPILE_IFELSE(
- 	[AC_LANG_SOURCE([
- 		#include <gvc.h>
- 
- 		int main(void) {
--			#ifdef WITH_CGRAPH
--				return 0;
--			#else
--				return -1;
-+			#ifndef WITH_CGRAPH
-+			#error
- 			#endif
-+			return 0;
- 		}
- 	])], [
- 		AC_MSG_RESULT([yes])
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 7ab6e72b5c..ca9cc486eb 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,10 +1,10 @@
 # Template file for 'vala'
 pkgname=vala
 version=0.40.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex libxslt pkg-config automake libtool"
-makedepends="graphviz-devel libfl-devel libglib-devel"
+makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
@@ -15,6 +15,11 @@ distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
 checksum=5c35e087a7054e9f0a514a0c1f1d0a0d7cf68d3e43c1dbeb840f9b0d815c0fa5
 
 pre_configure() {
+	# https://gitlab.gnome.org/GNOME/vala/issues/596
+	# http://www.linuxfromscratch.org/blfs/view/svn/general/vala.html
+	sed -i '115d; 121,137d; 139,140d' configure.ac
+	sed -i '/libvaladoc/d; /valadoc/d' Makefile.am
+	sed -i '/valadoc.1/d' doc/Makefile.am
 	autoreconf -fi
 }