diff --git a/graphviz-fix-includes.patch b/graphviz-fix-includes.patch
new file mode 100644
index 0000000..c70af68
--- /dev/null
+++ b/graphviz-fix-includes.patch
@@ -0,0 +1,13 @@
+Index: lib/common/types.h.in
+===================================================================
+--- lib/common/types.h.in.orig	2013-09-07 03:11:41.000000000 +0200
++++ lib/common/types.h.in	2013-12-11 17:12:07.000000000 +0100
+@@ -46,7 +46,7 @@ extern "C" {
+     typedef int (*bsearch_cmpf) (const void *, const void *);
+ 
+ #ifdef WITH_CGRAPH
+-#include <cgraph.h>
++#include "cgraph.h"
+     typedef struct Agraph_s graph_t;
+     typedef struct Agnode_s node_t;
+     typedef struct Agedge_s edge_t;
diff --git a/graphviz.changes b/graphviz.changes
index 3fa5eda..a009cf8 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 11 16:17:50 UTC 2013 - matz@suse.de
+
+- graphviz-fix-includes.patch: Use #include "cgraph.h", not <cgraph.h>
+  in graphviz/types.h.
+
 -------------------------------------------------------------------
 Tue Oct 29 12:22:26 CET 2013 - pth@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index 615a4d0..a5d5e8a 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -37,6 +37,9 @@ Patch4:         graphviz-python3_version.patch
 #                   This got accepted upstream so it can be removed on the next
 #                   release.
 Patch5:         graphviz-getaddrinfo.patch
+#PATCH-FIX-UPSTREAM This is fixed upstream in a similar way, can be
+#                   removed update to next release
+Patch6:         graphviz-fix-includes.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -97,6 +100,7 @@ Note: If you need output in png format you also need to install
 %patch3
 %patch4 -p1
 %patch5
+%patch6
 
 # Fix path in generated man pages
 sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl