diff --git a/common/shlibs b/common/shlibs
index c8159f660f..183cd911fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1086,6 +1086,7 @@ libcgraph.so.6 graphviz-libs-2.28.0_6
 libgvc.so.6 graphviz-libs-2.28.0_6
 libcdt.so.5 graphviz-libs-2.28.0_6
 libpathplan.so.4 graphviz-libs-2.28.0_6
+liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
 libmowgli-2.so.0 libmowgli-2.0.0_1
diff --git a/srcpkgs/graphviz/patches/CVE-2014-9157.patch b/srcpkgs/graphviz/patches/CVE-2014-9157.patch
deleted file mode 100644
index d8549c3911..0000000000
--- a/srcpkgs/graphviz/patches/CVE-2014-9157.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Subject: Fix format string vulnerability (CVE-2014-9157) in yyerror() routine
-Origin: https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081
-Bug-Debian: https://bugs.debian.org/772648
-Forwarded: no
-Author: Emden R. Gansner
-Last-Update: 2014-12-10
-
----
- lib/cgraph/scan.l |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- lib/cgraph/scan.l
-+++ lib/cgraph/scan.l
-@@ -225,7 +225,7 @@ void yyerror(char *str)
- 	agxbput (&xb, buf);
- 	agxbput (&xb, yytext);
- 	agxbput (&xb,"'\n");
--	agerr(AGERR,agxbuse(&xb));
-+	agerr(AGERR, "%s", agxbuse(&xb));
- 	agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
diff --git a/srcpkgs/graphviz/patches/cross.patch b/srcpkgs/graphviz/patches/cross.patch
index a98fd68779..44e2e052a2 100644
--- a/srcpkgs/graphviz/patches/cross.patch
+++ b/srcpkgs/graphviz/patches/cross.patch
@@ -1,11 +1,11 @@
---- lib/gvpr/Makefile.am.orig	2014-10-12 12:30:00.897952089 +0200
-+++ lib/gvpr/Makefile.am	2014-10-12 12:30:12.929055089 +0200
+--- lib/gvpr/Makefile.am.orig
++++ lib/gvpr/Makefile.am
 @@ -52,8 +52,7 @@ libgvpr_la_DEPENDENCIES = $(libgvpr_C_la
  
  mkdefs_SOURCES = mkdefs.c
  
--gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs
--	./mkdefs gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
+-gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT)
+-	./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
 +gdefs.h:
  
  EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcproj
diff --git a/srcpkgs/graphviz/patches/reduce_lab_color.patch b/srcpkgs/graphviz/patches/reduce_lab_color.patch
deleted file mode 100644
index 782229e036..0000000000
--- a/srcpkgs/graphviz/patches/reduce_lab_color.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Use a signed char instead of a double for lab_struct
- The massive data structure was using a double for each struct member,
- which makes the resulting object extremely large. By switching it to a
- signed char we reduce the size from around 20 MiB to 2.5 MiB, so an order
- of magnitude. The new data type should be fine as the number literals do
- not exceed the type range.
- .
- In any case this gets embedded into at least three binaries, one of which
- contais an extremely generic filename(!). Which is still rather ridiculous
- as this should most possibly be computable at run-time, or stored in a
- shared data file, or in a single shared library or plugin.
-Author: Guillem Jover <guillem@debian.org>
-Origin: vendor
-Bug-Debian:
-Forwarded: no
-Last-Update: 2014-07-18
-
----
-
---- lib/edgepaint/lab.h
-+++ lib/edgepaint/lab.h
-@@ -21,7 +21,7 @@ struct xyz_struct {
- typedef struct xyz_struct color_xyz;
- 
- struct lab_struct {
--  double l, a, b;/* l: 0 to 100, a,b: -128 tp 128 */
-+  signed char l, a, b;/* l: 0 to 100, a,b: -128 tp 128 */
- };
- typedef struct lab_struct color_lab;
- 
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index f9c8fb3c2d..a5ef7d3ef0 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,7 +1,7 @@
 # Template file for 'graphviz'
 pkgname=graphviz
-version=2.38.0
-revision=4
+version=2.40.1
+revision=1
 replaces="graphviz-libs<2.38.0_3"
 build_style=gnu-configure
 hostmakedepends="automake libtool flex pkg-config libltdl-devel"
@@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.graphviz.org"
 license="EPL"
 distfiles="http://www.graphviz.org/pub/graphviz/stable/SOURCES/$pkgname-$version.tar.gz"
-checksum=81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e
+checksum=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
 
 pre_configure() {
 	autoreconf -fi