diff --git a/.gitignore b/.gitignore
index f3ec4b9..a070c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /nest-2.14.0.tar.gz
 /nest-2.16.0.tar.gz
 /nest-2.18.0.tar.gz
+/nest-2.20.0.tar.gz
diff --git a/0001-Disable-python-setups.patch b/0001-Disable-python-setups.patch
new file mode 100644
index 0000000..3d6fcb8
--- /dev/null
+++ b/0001-Disable-python-setups.patch
@@ -0,0 +1,106 @@
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 95b7a1157..14f20daca 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -52,12 +52,12 @@ if ( NOT CMAKE_CROSSCOMPILING )
+ 
+         # Update the global help index to include all help files in
+         # the global installation directory for documentation.
+-        install( CODE
+-          "execute_process(
+-             COMMAND ${PYTHON_EXECUTABLE} -B generate_helpindex.py \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}\"
+-             WORKING_DIRECTORY \"${PROJECT_SOURCE_DIR}/extras/help_generator\"
+-             )"
+-          )
++        # install( CODE
++          # "execute_process(
++             # COMMAND ${PYTHON_EXECUTABLE} -B generate_helpindex.py \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}\"
++             # WORKING_DIRECTORY \"${PROJECT_SOURCE_DIR}/extras/help_generator\"
++             # )"
++          # )
+ 
+     endif ()
+ 
+diff --git a/extras/ConnPlotter/CMakeLists.txt b/extras/ConnPlotter/CMakeLists.txt
+index 1f7c2b32d..e9a6c3e29 100644
+--- a/extras/ConnPlotter/CMakeLists.txt
++++ b/extras/ConnPlotter/CMakeLists.txt
+@@ -18,15 +18,15 @@
+ # along with NEST.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ if ( HAVE_PYTHON )
+-  install( CODE "execute_process(
+-  COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
+-                             install --prefix=${CMAKE_INSTALL_PREFIX}
+-                                     --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
+-                                     --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
+-                                     --install-data=${CMAKE_INSTALL_FULL_DATADIR}
+-    WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
+-      )
+-
++  # install( CODE "execute_process(
++  # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
++                             # install --prefix=${CMAKE_INSTALL_PREFIX}
++                                     # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
++                                     # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
++                                     # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
++    # WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
++      # )
++#
+   install( FILES examples/connplotter_tutorial.py
+       DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/ConnPlotter
+       )
+diff --git a/pynest/CMakeLists.txt b/pynest/CMakeLists.txt
+index 6464dc6e2..82d8ab0eb 100644
+--- a/pynest/CMakeLists.txt
++++ b/pynest/CMakeLists.txt
+@@ -73,14 +73,14 @@ if ( HAVE_PYTHON )
+       -D_IS_PYNEST
+       )
+ 
+-  install( CODE "execute_process(
+-    COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
+-                               install --prefix=${CMAKE_INSTALL_PREFIX}
+-                                       --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
+-                                       --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
+-                                       --install-data=${CMAKE_INSTALL_FULL_DATADIR}
+-    WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
+-      )
++  # install( CODE "execute_process(
++    # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
++                               # install --prefix=${CMAKE_INSTALL_PREFIX}
++                                       # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
++                                       # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
++                                       # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
++    # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
++      # )
+   install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ )
+   install( FILES ${PROJECT_BINARY_DIR}/pynest/do_tests.py
+       DESTINATION ${CMAKE_INSTALL_DATADIR}/extras
+diff --git a/topology/CMakeLists.txt b/topology/CMakeLists.txt
+index d9575d630..c42df40d1 100644
+--- a/topology/CMakeLists.txt
++++ b/topology/CMakeLists.txt
+@@ -82,14 +82,14 @@ install( FILES ${install_headers}
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nest)
+ 
+ if ( HAVE_PYTHON )
+-  install( CODE "execute_process(
+-    COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
+-                               install --prefix=${CMAKE_INSTALL_PREFIX}
+-                                       --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
+-                                       --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
+-                                       --install-data=${CMAKE_INSTALL_FULL_DATADIR}
+-    WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
+-      )
++  # install( CODE "execute_process(
++    # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
++                               # install --prefix=${CMAKE_INSTALL_PREFIX}
++                                       # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
++                                       # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
++                                       # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
++    # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
++      # )
+ 
+   file( GLOB topo_examples "examples/*" )
+   install( FILES ${topo_examples}
diff --git a/nest.spec b/nest.spec
index 7d5eb04..3a69924 100644
--- a/nest.spec
+++ b/nest.spec
@@ -12,11 +12,11 @@
 %bcond_with tests
 
 Name:           nest
-Version:        2.18.0
+Version:        2.20.0
 
 %global gittag v%{version}
 
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        The neural simulation tool
 
 License:        GPLv2+
@@ -30,7 +30,8 @@ Source1:        README-Fedora.md
 # 2. The helpindex must be generated after the help files have been installed
 # to the install location, so we do this manually because the script doesn't
 # respect rpmbuildroot and so on
-Patch0:         %{name}-0000-disable-pybits.patch
+# Patch0:         %%{name}-0000-disable-pybits.patch
+Patch0:         0001-Disable-python-setups.patch
 
 
 BuildRequires:  ncurses-devel
@@ -170,12 +171,14 @@ Recommends: %{py3_dist ipython}
 %endif
 
 %prep
-%autosetup -c -n %{name}-simulator-%{version} -p0
+%autosetup -c -n %{name}-simulator-%{version} -N
 cp %{SOURCE1} ./ -v
 cp %{name}-simulator-%{version}/LICENSE . -v
 
 # Tweaks
 pushd %{name}-simulator-%{version}
+# Apply the patch
+%patch0 -p1
 # We'll set it ourselves - easier for mpi implementations
 sed -i.orig '/PYEXECDIR/ d' cmake/ProcessOptions.cmake
 # These files are all in standard locations so we don't need them
@@ -606,6 +609,9 @@ export MPI_SITEARCH=$MPI_PYTHON3_SITEARCH
 %endif
 
 %changelog
+* Sat Feb 01 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.20.0-1
+- Update to 2.20.0
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 7868ae1..7128c7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nest-2.18.0.tar.gz) = 69d6460afaaa252432b2d64ab3200b35fca9535607a234772cad19a161fefbdec23fbde632c5823205f461f8112bf06a1d54db4f6dfec492c33615c483502ffa
+SHA512 (nest-2.20.0.tar.gz) = de1e4775de156e76af7522e382e530a413c18b2bae40d1cfdf35b45a0638d19687e1f255ccc49ecde17128ab4f9718d22b8803ca360993de49f0f80e95c16850