diff --git a/graphviz-2.18-do_not_use_ocamlopt.patch b/graphviz-2.18-do_not_use_ocamlopt.patch
new file mode 100644
index 0000000..3b170fd
--- /dev/null
+++ b/graphviz-2.18-do_not_use_ocamlopt.patch
@@ -0,0 +1,15 @@
+--- tclpkg/gv/Makefile.am
++++ tclpkg/gv/Makefile.am
+@@ -73,9 +73,9 @@
+ 
+ pkgocamldir = $(pkglibdir)/ocaml
+ OCAML_data = gv.cmo gv.cma gv.cmi gv.mli META.gv
+-if WITH_OCAMLOPT
+-OCAML_data += gv.a gv.cmx gv.cmxa
+-endif
++#if WITH_OCAMLOPT
++#OCAML_data += gv.a gv.cmx gv.cmxa
++#endif
+ nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_data)
+ libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
+ libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes
index e0fdff1..7905872 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 29 19:30:23 CEST 2008 - pth@suse.de
+
+- Disable the use of ocamlopt as the archive turns up empty (bnc#384855).
+
 -------------------------------------------------------------------
 Sun Apr 27 14:41:08 CEST 2008 - coolo@suse.de
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index 4527493..38a3a5c 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -24,7 +24,7 @@ BuildRequires:  graphviz gtkglext-devel libglade2-devel libgnomeui-devel
 BuildRequires:  fdupes
 %endif
 Version:        2.18
-Release:        7
+Release:        8
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -48,6 +48,7 @@ Patch13:        graphviz-stddefs.patch
 Patch100:       graphviz-plugins-fix_install_dirs.patch
 Patch101:       graphviz-plugins-tcl_install_dir.patch
 Patch102:       graphviz-no_strict_aliasing.patch
+Patch103:       graphviz-2.18-do_not_use_ocamlopt.patch
 Url:            http://www.graphviz.org/
 License:        IBM Public License
 Prefix:         /usr
@@ -376,6 +377,7 @@ Authors:
 %patch100
 %patch101
 %patch102
+%patch103
 # 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
 # remove broken macros
@@ -566,6 +568,8 @@ done
 %doc __doc/*
 
 %changelog
+* Tue Apr 29 2008 pth@suse.de
+- Disable the use of ocamlopt as the archive turns up empty (bnc#384855).
 * Sun Apr 27 2008 coolo@suse.de
 - fix build
 * Tue Apr 22 2008 pth@suse.de
diff --git a/graphviz.spec b/graphviz.spec
index 551cf96..4d2d4d2 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -18,7 +18,7 @@ BuildRequires:  xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
 BuildRequires:  xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
 PreReq:         /bin/rm
 Version:        2.18
-Release:        13
+Release:        16
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph