diff --git a/.gitignore b/.gitignore
index 0b35f3b..def86b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
 /render-5.16.0-beta-1.zip
 /libSBML-5.17.0-core-plus-packages-src.tar.gz
 /libSBML-5.17.0-render-src.zip
+/libSBML-5.18.0-core-plus-packages-src.tar.gz
+/libSBML-5.18.0-render-src.zip
diff --git a/libsbml-5.17.0-fix_bug463.patch b/libsbml-5.17.0-fix_bug463.patch
deleted file mode 100644
index 6a82ca1..0000000
--- a/libsbml-5.17.0-fix_bug463.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/sbml/Compartment.cpp
-+++ b/src/sbml/Compartment.cpp
-@@ -283,7 +283,14 @@
-     }
-     else
-     {
--      return static_cast<unsigned int>(mSpatialDimensionsDouble);
-+      if (util_isNaN(mSpatialDimensionsDouble))
-+      {
-+        return 0;
-+      }
-+      else
-+      {
-+        return static_cast<unsigned int>(mSpatialDimensionsDouble);
-+      }
-     }
-   }
- }
diff --git a/libsbml-5.17.0-swigdoc_fix.patch b/libsbml-5.17.0-swigdoc_fix.patch
deleted file mode 100644
index 7cbb984..0000000
--- a/libsbml-5.17.0-swigdoc_fix.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/src/bindings/swig/swigdoc.py
-+++ b/src/bindings/swig/swigdoc.py
-@@ -7,6 +7,7 @@
- # @author Akiya Jouraku
- # @author Michael Hucka
- # @author Frank Bergmann
-+# @author Brett Olivier
- #
- #<!---------------------------------------------------------------------------
- # This file is part of libSBML.  Please visit http://sbml.org for more
-@@ -57,7 +58,7 @@
- # small C# program to gather this info prior to running swigdoc.py.
- 
- overriders = \
--{ 
-+{
- 'AlgebraicRule'             : [ 'clone', 'hasRequiredAttributes' ],
- 'AssignmentRule'            : [ 'clone', 'hasRequiredAttributes' ],
- 'Compartment'               : [ 'clone', 'getId', 'getName', 'isSetId', 'isSetName', 'getTypeCode', 'getElementName', 'hasRequiredAttributes', 'setId', 'setName', 'unsetId', 'unsetName' ],
-@@ -458,7 +459,7 @@
-     # that we put into %javamethodmodifiers.  The result is that the java
-     # documentation for the methods are empty.  I can't figure out why, but
-     # have figured out that if we omit the argument list in the doc string
--    # that is put on %javamethodmodifiers for such case, swig does generate 
-+    # that is put on %javamethodmodifiers for such case, swig does generate
-     # the comments for those methods.  This approach is potentially dangerous
-     # because swig might attach the doc string to the wrong method if a
-     # methods has multiple versions with varying argument types, but the
-@@ -814,7 +815,14 @@
- 
- def translateAllowingBreaks (translations, docstring):
-   for pair in translations:
--    new_pattern = re.sub(' ', r'\s+\*?\s*', pair[0])
-+    # Unknown escapes consisting of '\' and an ASCII letter in
-+    # replacement templates for re.sub() were deprecated in
-+    # Python 3.5, and will now cause an error in Python 3.7
-+    # simple fallback implemented for now.
-+    try:
-+      new_pattern = re.sub(' ', r'\s+\*?\s*', pair[0])
-+    except re.error:
-+      new_pattern = re.sub(' ', r'\\s+\*?\\s*', pair[0])
-     replacement = pair[1]
-     docstring   = re.sub(new_pattern, replacement, docstring)
-   return docstring
-@@ -948,7 +956,7 @@
-   symbol    = split[0].strip()
-   type_name = split[1].strip()
-   return '@link ' + type_name + '#' + symbol + ' ' + symbol + '@endlink'
-- 
-+
- 
- 
- def rewriteEnumLink (match):
-@@ -1569,7 +1577,7 @@
-   elif language == 'csharp':
-     pre  = '%csmethodmodifiers'
-     if f != None and f.isVirtual:
--      # this time we note right from the start, whether a function is virtual or not	  
-+      # this time we note right from the start, whether a function is virtual or not
-       if classname in virtual_functions and methodname in virtual_functions[classname]:
-         post = ' public virtual'
-       else:
-@@ -1840,9 +1848,9 @@
-   # file, post-process it, and write the final output to the real destination.
- 
-   tmpfilename = output_swig_file + ".tmp"
--  
--  # in case we have parallel processes writing to the file, we ensure, that 
--  # each process writes its own file. 
-+
-+  # in case we have parallel processes writing to the file, we ensure, that
-+  # each process writes its own file.
-   count = 1
-   while os.path.isfile(tmpfilename):
-     print ("warning: detected multiple run of swigdoc.py, this should not be happening!")
-@@ -1901,21 +1909,21 @@
-   try:
-     finalstream = open(output_swig_file, 'w')
-     postProcessOutput(tmpstream, finalstream)
--    
-+
-     try:
-       tmpstream.flush()
-       tmpstream.close()
-     except (Exception,):
-       e = sys.exc_info()[1]
-       #FB: not printing the warning below, as after all the documentation file
--      #    has been correctly created. 
-+      #    has been correctly created.
-       pass
-       # print "\tWarning, error flushing stream \n\t\t'%s'. \n\tThis is not a
-       # serious error, but an issue with the python interpreter known to occur
-       # in python 2.7." % e
-     finalstream.flush()
-     finalstream.close()
--  except: 
-+  except:
-     print ("error: could not write: " + output_swig_file)
- 
-   os.remove(tmpfilename)
-@@ -1923,10 +1931,10 @@
- 
- if __name__ == '__main__':
-   main(sys.argv)
-- 
-+
- 
- 
- ## The following is for Emacs users.  Please leave in place.
--## Local Variables: 
-+## Local Variables:
- ## python-indent-offset: 2
--## End: 
-+## End:
diff --git a/libsbml.spec b/libsbml.spec
index 1038070..6063ebe 100644
--- a/libsbml.spec
+++ b/libsbml.spec
@@ -2,12 +2,7 @@
 %bcond_without ruby
 %bcond_with    octave
 %bcond_without r
-%bcond_without python3
-%if 0%{?fedora} >= 30
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
+%bcond_without python
 %bcond_without check
 
 %ifarch %{mono_arches}
@@ -37,8 +32,8 @@
 %global _docdir_fmt %{name}
 
 Name:           libsbml
-Version:        5.17.0
-Release:        13%{?dist}
+Version:        5.18.0
+Release:        1%{?dist}
 Summary:        Systems Biology Markup Language library
 License:        LGPLv2+
 URL:            http://sbml.org/Software/libSBML
@@ -51,12 +46,6 @@ Patch0:         libsbml-use-system-minizip-cmake.patch
 ## Fix library installation paths
 Patch1:         libsbml-fix_install_libpaths.patch
 
-## https://sourceforge.net/p/sbml/libsbml/461/
-Patch2:         libsbml-%{version}-swigdoc_fix.patch
-
-## https://sourceforge.net/p/sbml/libsbml/463/
-Patch3:         libsbml-%{version}-fix_bug463.patch
-
 BuildRequires:  cmake
 BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
@@ -68,15 +57,15 @@ BuildRequires:  check-devel
 %if 0%{?fedora} == 29
 BuildRequires:  minizip-compat-devel
 %endif
-%if 0%{?fedora} == 28
-BuildRequires:  minizip-devel
-%endif
 %if 0%{?fedora} >= 30
 #BuildRequires:  minizip-devel >= 2.5.0
 %endif
 BuildRequires:  swig
 BuildRequires:  hostname
 
+# Python2 is no longer supported
+Obsoletes:      python2-%{name}
+
 %description
 LibSBML is an open-source programming library designed to
 read, write, manipulate, translate, and validate SBML files and data
@@ -98,20 +87,7 @@ Provides:       %{name}-static = %{version}-%{release}
 This package contains libraries and header files for developing
 applications that use libSBML.
 
-%if %{with python2}
-%package -n python2-%{name}
-BuildRequires:  python2-devel
-Summary:        Python 2 bindings for libSBML
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%{?python_provide:%python_provide python2-%{name}}
-
-%description -n python2-%{name}
-This package contains %{summary}.
-
-This is the version for Python 2.
-%endif
-%if %{with python3}
+%if %{with python}
 %package -n python3-%{name}
 BuildRequires:  python3-devel
 Summary:        Python 3 bindings for libSBML
@@ -226,22 +202,19 @@ This package contains %{summary}.
 %autosetup -n libSBML-%{version}-Source -N
 
 %patch1 -p1
-%patch3 -p1
-
-%if %{with python3}
-%patch2 -p1
-%endif
 
 unzip -n %{SOURCE1}
 
 # https://sourceforge.net/p/sbml/libsbml/391
 iconv -f latin1 -t utf8 NEWS.txt > t; touch -r NEWS.txt t; mv t NEWS.txt
 
+%if %{with python}
 # Fix invalid shebang
 # https://sourceforge.net/p/sbml/libsbml/390
 for i in `find docs/src/filters -type f \( -name "*.py" \)`; do
-sed -i -r 's|(#!/usr/bin/env python) +#.*|#!%{__python2}|' $i
+sed -i -r 's|(#!/usr/bin/env python) +#.*|#!%{__python3}|' $i
 done
+%endif
 
 # Unbundle minizip on fedora < 30
 # This package needs works for using new minizip >= 2.5.0 (rhbz#1632208)
@@ -256,34 +229,11 @@ mkdir build-docs
 cp -a $(/bin/ls -1|grep -v build-docs) build-docs/
 
 %build
-mkdir -p build2 build
-pushd build2
+mkdir -p build && pushd build
 %{set_build_flags}
-%if %{with python2}
-# This build is only for Python 2
 %cmake -DENABLE_{LAYOUT,QUAL,COMP,FBC,RENDER,GROUPS,MULTI}=ON \
        -DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \
-       -DWITH_PYTHON:BOOL=ON \
-%if %{with check}
-       -DWITH_CHECK=ON \
-%endif
-       -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python2_version} \
-       -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python2_version}.so \
-       -DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
-       -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-       -DWITH_LIBXML:BOOL=ON \
-       -DWITH_EXPAT:BOOL=OFF \
-       -DWITH_MATLAB:BOOL=OFF \
-       -Wno-dev -DEXIT_ON_ERROR:BOOL=ON \
-       ..
-%make_build
-%endif
-
-pushd ../build
-%{set_build_flags}
-%cmake -DENABLE_{LAYOUT,QUAL,COMP,FBC,RENDER,GROUPS,MULTI}=ON \
-       -DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \
-%if %{with python3}
+%if %{with python}
        -DWITH_PYTHON:BOOL=ON \
        -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}m \
        -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}m.so \
@@ -333,8 +283,9 @@ pushd ../build
        -Wno-dev -DEXIT_ON_ERROR:BOOL=ON \
        ..
 %make_build
+popd
 
-pushd ../build-docs
+pushd build-docs
 %configure --disable-static \
            --with-expat=no \
            --with-libxml=yes \
@@ -349,12 +300,10 @@ pushd ../build-docs
 cp ../build/src/bindings/python/libsbml-doxygen.py src/bindings/python/
 %make_build docs
 %endif
+
 %make_build libsbml.pc
 
 %install
-%if %{with python2}
-%make_install -C build2
-%endif
 %make_install -C build
 
 rm -f %{buildroot}%{_datadir}/%{name}/*.txt
@@ -388,21 +337,11 @@ install -Dm0644 src/bindings/ruby/README.txt %{buildroot}%{_pkgdocdir}/README-ru
 %endif
 
 %if %{with check}
-
 %check
-%if %{with python2}
-export CK_FORK=no
-pushd build2
-ctest --force-new-ctest-process -VV \
-      -E "test_ruby_binding"
-popd
-%endif
-
 pushd build
 ctest --force-new-ctest-process -VV \
         -E "test_ruby_binding"
 popd
-
 %endif
 
 %ldconfig_scriptlets
@@ -424,14 +363,7 @@ popd
 %{_libdir}/cmake/sbml-*.cmake
 %{_libdir}/pkgconfig/%{name}.pc
 
-%if %{with python2}
-%license COPYING.txt LICENSE.txt
-%files -n python2-%{name}
-%{python2_sitearch}/%{name}.pth
-%{python2_sitearch}/%{name}
-%endif
-
-%if %{with python3}
+%if %{with python}
 %files -n python3-%{name}
 %license COPYING.txt LICENSE.txt
 %{python3_sitearch}/%{name}.pth
@@ -490,6 +422,10 @@ popd
 %endif
 
 %changelog
+* Tue Apr 30 2019 Antonio Trande <sagitterATfedoraproject.org> - 5.18.0-1
+- Update to 5.18.0
+- Drop python2-libsbml
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.17.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index a24f4b1..5916262 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libSBML-5.17.0-core-plus-packages-src.tar.gz) = 5246572bf8da10c42f28aef7db05593e45d53e67a8baf02cc6b6d6497093496e1dee4169e8cda491e9e6e454ca15cc3fb78cf4687946d4226a9e65ab902c995d
-SHA512 (libSBML-5.17.0-render-src.zip) = 59d7f8c757901c7ea64ec11970619f7a43c7258fb62c756ef4df061a6db1d98009c3bc087864b28a30eaca9138005949b1abd43997029047c101e383a130f606
+SHA512 (libSBML-5.18.0-core-plus-packages-src.tar.gz) = 49dedaa2fcd2077e7389a8f940adf931d80aa7a8f9d57330328372d2ac8ebcaeb03a20524df2fe0f1c6933587904613754585076c46e6cb5d6f7a001f427185b
+SHA512 (libSBML-5.18.0-render-src.zip) = 79902b5826eed3c4881fe771b4a862684c293ff7dda23e525101d96c98d6e4c37e18fd81278fc8cbe717f6d55079e9b695cbe7bc83267e32be23ba63f33c9ee3