diff --git a/swig-ocaml-int64.patch b/swig-ocaml-int64.patch
new file mode 100644
index 0000000..0383d13
--- /dev/null
+++ b/swig-ocaml-int64.patch
@@ -0,0 +1,19 @@
+ocaml pr#6517
+---
+ Lib/ocaml/ocamldec.swg |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Lib/ocaml/ocamldec.swg
++++ b/Lib/ocaml/ocamldec.swg
+@@ -101,9 +101,9 @@ SWIGEXT {
+ 
+ 
+ #ifndef ARCH_ALIGN_INT64
+-#define SWIG_Int64_val(v) (*((int64 *) SWIG_Data_custom_val(v)))
++#define SWIG_Int64_val(v) (*((int64_t *) SWIG_Data_custom_val(v)))
+ #else
+-CAMLextern int64 Int64_val(caml_value_t v);
++CAMLextern int64_t Int64_val(caml_value_t v);
+ #define SWIG_Int64_val(v) Int64_val(v)
+ #endif
+ 
diff --git a/swig.changes b/swig.changes
index 25b20da..fb0aa37 100644
--- a/swig.changes
+++ b/swig.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 23 15:19:08 UTC 2016 - olaf@aepfle.de
+
+- Add disabled build conditional for ocaml support (fate#320836)
+- Add swig-ocaml-int64.patch (ocaml PR#6517, fate#320836)
+
 -------------------------------------------------------------------
 Tue Feb  2 14:45:14 UTC 2016 - rguenther@suse.com
 
@@ -138,6 +144,11 @@ Mon Mar 17 07:46:53 UTC 2014 - kkaempf@suse.com
   ruby-1.8.6-newobject.patch, and swig-fix_ocaml_type.patch.
   All upstreamed.
 
+-------------------------------------------------------------------
+Mon Mar 10 01:00:30 CET 2014 - ro@suse.de
+
+- set CCSHARED to "-fPIC" on s390/s390x 
+
 -------------------------------------------------------------------
 Sun Feb  9 18:30:13 UTC 2014 - kkaempf@suse.com
 
diff --git a/swig.spec b/swig.spec
index bf19949..3821c21 100644
--- a/swig.spec
+++ b/swig.spec
@@ -16,6 +16,8 @@
 #
 
 
+%bcond_with  swig_ocaml
+
 Name:           swig
 Version:        3.0.8
 Release:        0
@@ -27,11 +29,18 @@ Source:         http://sourceforge.net/projects/swig/files/swig/%{name}-%{versio
 Source1:        %{name}.rpmlintrc
 Patch1:         swig308-Fix-li_boost_array-test.patch
 Patch2:         swig308-isfinite.diff
+Patch3:         swig-ocaml-int64.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  boost-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
+%if %{with swig_ocaml}
+BuildRequires:  ncurses-devel
+BuildRequires:  ocaml
+BuildRequires:  ocaml-camlp4-devel
+BuildRequires:  ocaml-findlib
+%endif
 BuildRequires:  pcre-devel
 BuildRequires:  perl
 BuildRequires:  python-devel
@@ -122,10 +131,18 @@ understandig SWIG usage.
 %setup -q
 %patch1 -p1
 %patch2
+%patch3 -p1
 
 %build
+%ifarch s390 s390x
+export CCSHARED="-fPIC"
+%endif
 ./autogen.sh
-%configure --disable-ccache
+%configure \
+%if %{without swig_ocaml}
+	--without-ocaml \
+%endif
+	--disable-ccache
 make %{?_smp_mflags}
 
 %check