diff --git a/.gitignore b/.gitignore
index c74baa3..37e615a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /render-5.11.4-beta-1.zip
 /render-5.11.6-beta-1.zip
 /libSBML-5.11.6-core-plus-packages-src.tar.gz
+/libSBML-5.12.0-core-plus-packages-src.tar.gz
+/render-5.12.0-beta-1.zip
diff --git a/libsbml-fix_install_libpaths.patch b/libsbml-fix_install_libpaths.patch
index e7073fb..e9166bb 100644
--- a/libsbml-fix_install_libpaths.patch
+++ b/libsbml-fix_install_libpaths.patch
@@ -13,7 +13,7 @@
  endif()
 --- a/src/bindings/csharp/CMakeLists.orig.txt	2014-11-26 13:31:17.000000000 +0100
 +++ b/src/bindings/csharp/CMakeLists.txt	2014-12-29 11:37:43.839593422 +0100
-@@ -199,7 +199,7 @@
+@@ -203,7 +203,7 @@
  #
  set(CSHAPR_PACKAGE_INSTALL_DIR)
  if (UNIX OR CYGWIN)
@@ -35,7 +35,7 @@
  endif()
 --- a/src/bindings/perl/CMakeLists.orig.txt	2014-11-26 13:31:13.000000000 +0100
 +++ b/src/bindings/perl/CMakeLists.txt	2014-12-29 11:48:53.705649453 +0100
-@@ -176,7 +176,7 @@
+@@ -224,7 +224,7 @@
    string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM})
    string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM})
    string(REPLACE "archname=" "" PERL_PLATFORM ${PERL_PLATFORM})
diff --git a/libsbml-fix_rewrite_pydoc.patch b/libsbml-fix_rewrite_pydoc.patch
new file mode 100644
index 0000000..439d37c
--- /dev/null
+++ b/libsbml-fix_rewrite_pydoc.patch
@@ -0,0 +1,15 @@
+--- src/bindings/python/doc-converter/rewrite_pydoc.py
++++ src/bindings/python/doc-converter/rewrite_pydoc.py
+@@ -596,7 +596,11 @@
+         file = open(file_path, 'r')
+ 
+         writer = RewritePydocStringWriter()
+-        parser = RewritePydocHTMLParser(AbstractFormatter(writer))
++        parser = None
++        try: 
++          parser = RewritePydocHTMLParser(AbstractFormatter(writer))
++        except: 
++          parser = RewritePydocHTMLParser()
+         parser.feed(file.read())
+         parser.close()
+         file.close()
diff --git a/libsbml-use-system-minizip-cmake.patch b/libsbml-use-system-minizip-cmake.patch
index 2764c49..f0f3c9f 100644
--- a/libsbml-use-system-minizip-cmake.patch
+++ b/libsbml-use-system-minizip-cmake.patch
@@ -2,7 +2,7 @@ diff --git libSBML-5.11.0-Source/CMakeLists.txt~ libSBML-5.11.0-Source/CMakeList
 index 14bf5cc5bb..85229454e9 100644
 --- libSBML-5.11.0-Source/CMakeLists.txt~
 +++ libSBML-5.11.0-Source/CMakeLists.txt
-@@ -611,6 +611,8 @@ ${LIBSBML_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log")
+@@ -638,6 +638,8 @@ ${LIBSBML_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log")
  valid. It should contain the file zlib.h, but it does not.")
      endif()
  
@@ -15,7 +15,7 @@ diff --git libSBML-5.11.0-Source/src/CMakeLists.txt~ libSBML-5.11.0-Source/src/C
 index f9406186c9..e8f277edcf 100644
 --- libSBML-5.11.0-Source/src/CMakeLists.txt~
 +++ libSBML-5.11.0-Source/src/CMakeLists.txt
-@@ -342,12 +342,6 @@ endif()
+@@ -349,12 +349,6 @@ endif()
  if(WITH_ZLIB)
  
  set(COMPRESS_SOURCES ${COMPRESS_SOURCES}
@@ -28,7 +28,7 @@ index f9406186c9..e8f277edcf 100644
          sbml/compress/zfstream.h
          sbml/compress/zfstream.cpp
          sbml/compress/zipfstream.cpp
-@@ -366,8 +360,8 @@ set(COMPRESS_SOURCES ${COMPRESS_SOURCES}
+@@ -373,8 +367,8 @@ set(COMPRESS_SOURCES ${COMPRESS_SOURCES}
          )
      endif()
  
diff --git a/libsbml.spec b/libsbml.spec
index a822e07..77c3262 100644
--- a/libsbml.spec
+++ b/libsbml.spec
@@ -8,6 +8,12 @@
 %bcond_without r
 %bcond_without python3
 %bcond_without python2
+
+## Python3.5
+%if 0%{?fedora} > 23
+%global with_python35 1
+%endif
+
 ##On following arches tests are not built properly
 %if 0%{?fedora} > 22
 %ifarch s390 s390x ppc64 ppc64le %{arm}
@@ -48,8 +54,8 @@
 %global _docdir_fmt %{name}
 
 Name:           libsbml
-Version:        5.11.6
-Release:        10%{?dist}
+Version:        5.12.0
+Release:        1%{?dist}
 Summary:        Systems Biology Markup Language library
 
 License:        LGPLv2+
@@ -58,9 +64,11 @@ Source0:        http://sourceforge.net/projects/sbml/files/libsbml/%{version}-ex
 Source1:        http://sourceforge.net/projects/sbml/files/libsbml/%{version}-experimental/source/beta%20packages/render-%{version}-beta-1.zip
 
 ## Unbundle minizip
-Patch0:         libsbml-use-system-minizip-cmake.patch
+Patch0:         %{name}-use-system-minizip-cmake.patch
 ## Fix library installation paths
-Patch1:         libsbml-fix_install_libpaths.patch
+Patch1:         %{name}-fix_install_libpaths.patch
+## http://sourceforge.net/p/sbml/libsbml/417/
+Patch2:         %{name}-fix_rewrite_pydoc.patch
 
 BuildRequires:  cmake, clang
 BuildRequires:  zlib-devel
@@ -213,7 +221,12 @@ This package contains %{summary}.
 %endif
 
 %prep
-%autosetup -n libSBML-%{version}-Source -p1
+%autosetup -n libSBML-%{version}-Source -N
+%patch0 -p1
+%patch1 -p1
+%if 0%{?with_python35}
+%patch2 -p0
+%endif
 
 sed -i -r 's/DOXYGEN_MAX_VERSION=1\.8\.8/DOXYGEN_MAX_VERSION=1.8.9/' configure
 
@@ -477,6 +490,10 @@ ctest --force-new-ctest-process -V -E "test_ruby_binding"
 %endif
 
 %changelog
+* Sat Nov 14 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.12.0-1
+- Update to 5.12.0
+- Added patch(#2) for the formatter with Python3.5
+
 * Wed Nov 11 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
 
diff --git a/sources b/sources
index c6b8eb6..6b392a1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-667818f5dceff0f9d191df81c3900b10  libSBML-5.11.6-core-plus-packages-src.tar.gz
-a9a4003f983a786bf11b21ef764ee367  render-5.11.6-beta-1.zip
+76da5911d2c394c105f7d52766ad9ab5  libSBML-5.12.0-core-plus-packages-src.tar.gz
+9de61b9fcd1331557038d029200d0e52  render-5.12.0-beta-1.zip