diff --git a/.gitignore b/.gitignore
index 54e371e..839e458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ ginac-1.5.6.tar.bz2
 /ginac-1.7.7.tar.bz2
 /ginac-1.7.8.tar.bz2
 /ginac-1.7.9.tar.bz2
+/ginac-1.8.0.tar.bz2
diff --git a/ginac.cmake-find-python.patch b/ginac.cmake-find-python.patch
deleted file mode 100644
index a1f8574..0000000
--- a/ginac.cmake-find-python.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cdb18f09..cc16cf05 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,8 @@ string(REGEX REPLACE "^.*GINAC_LT_REVISION[ \t]+([0-9]+).*" "\\1" ginac_lt_revis
- math(EXPR ginaclib_soversion "${ginac_lt_current} - ${ginac_lt_age}")
- set(ginaclib_version ${ginaclib_soversion}.${ginac_lt_age}.${ginac_lt_revision})
- 
-+find_package(PythonInterp 3 EXACT REQUIRED)
-+
- # make check
- enable_testing()
- add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index e1416d31..7a226a26 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -45,7 +45,7 @@ macro(pdflatex_process texfile)
- 	add_custom_command(
- 		OUTPUT ${_ind}
- 		COMMAND ${MAKEINDEX_COMPILER} ${_idx}
--		COMMAND python ${_fixupind} ${_idx}
-+		COMMAND ${PYTHON_EXECUTABLE} ${_fixupind} ${_idx}
- 		WORKING_DIRECTORY ${_dirname}
- 		DEPENDS ${texfile} ${_idx}
- 		COMMENT "MAKEINDEX ${_basename}.idx")
-diff --git a/ginac/CMakeLists.txt b/ginac/CMakeLists.txt
-index 27f4db8d..d3d344c1 100644
---- a/ginac/CMakeLists.txt
-+++ b/ginac/CMakeLists.txt
-@@ -168,11 +168,11 @@ install(FILES ${ginaclib_public_headers} DESTINATION "${INCLUDE_INSTALL_DIR}/gin
- 
- add_custom_command(
- 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/function.h
--	COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/function.py -o ${CMAKE_CURRENT_BINARY_DIR}/function.h ${CMAKE_CURRENT_SOURCE_DIR}/function.hppy
-+	COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/function.py -o ${CMAKE_CURRENT_BINARY_DIR}/function.h ${CMAKE_CURRENT_SOURCE_DIR}/function.hppy
- 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/function.hppy ${CMAKE_CURRENT_SOURCE_DIR}/function.py)
- 
- add_custom_command(
- 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/function.cpp
--	COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/function.py -o ${CMAKE_CURRENT_BINARY_DIR}/function.cpp ${CMAKE_CURRENT_SOURCE_DIR}/function.cppy
-+	COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/function.py -o ${CMAKE_CURRENT_BINARY_DIR}/function.cpp ${CMAKE_CURRENT_SOURCE_DIR}/function.cppy
- 	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/function.h ${CMAKE_CURRENT_SOURCE_DIR}/function.cppy ${CMAKE_CURRENT_SOURCE_DIR}/function.py)
- 
-diff --git a/ginsh/CMakeLists.txt b/ginsh/CMakeLists.txt
-index 9f4c0a8f..5e408594 100644
---- a/ginsh/CMakeLists.txt
-+++ b/ginsh/CMakeLists.txt
-@@ -40,13 +40,13 @@ endif()
- 
- add_custom_command(
- 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ginsh_fcn_help.h
--	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ginsh_fcn_help.py -o ginsh_fcn_help.h ${CMAKE_CURRENT_SOURCE_DIR}/ginsh.1.in
-+	COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ginsh_fcn_help.py -o ginsh_fcn_help.h ${CMAKE_CURRENT_SOURCE_DIR}/ginsh.1.in
- 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ginsh.1.in ${CMAKE_CURRENT_SOURCE_DIR}/ginsh_fcn_help.py
- 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 
- add_custom_command(
- 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ginsh_op_help.h
--	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ginsh_op_help.py -o ginsh_op_help.h ${CMAKE_CURRENT_SOURCE_DIR}/ginsh.1.in
-+	COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ginsh_op_help.py -o ginsh_op_help.h ${CMAKE_CURRENT_SOURCE_DIR}/ginsh.1.in
- 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ginsh.1.in ${CMAKE_CURRENT_SOURCE_DIR}/ginsh_op_help.py
- 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 
diff --git a/ginac.excompiler-install.patch b/ginac.excompiler-install.patch
deleted file mode 100644
index 544b471..0000000
--- a/ginac.excompiler-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --color -ur ginac-1.7.9/tools/CMakeLists.txt ginac-1.7.9.excompiler-install.patch/tools/CMakeLists.txt
---- ginac-1.7.9/tools/CMakeLists.txt	2020-04-08 17:38:00.000000000 +0200
-+++ ginac-1.7.9.excompiler-install.patch/tools/CMakeLists.txt	2020-10-25 11:40:10.388559215 +0100
-@@ -12,5 +12,5 @@
-           "${CMAKE_CURRENT_BINARY_DIR}/ginac-excompiler"
- 	)
- 
--	install(PROGRAMS ginac-excompiler DESTINATION "${LIBEXECDIR}")
-+install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/ginac-excompiler" DESTINATION "${LIBEXECDIR}")
- endif (CMAKE_COMPILER_IS_GNUCC)
diff --git a/ginac.spec b/ginac.spec
index 6b4b4d9..6b12afb 100644
--- a/ginac.spec
+++ b/ginac.spec
@@ -1,17 +1,13 @@
-%global so_ver 6
+%global so_ver 11
 
 Name:             ginac
-Version:          1.7.11
+Version:          1.8.0
 Release:          1%{?dist}
 Summary:          C++ library for symbolic calculations
 License:          GPLv2+
 URL:              https://www.ginac.de/
 Source0:          https://www.ginac.de/%{name}-%{version}.tar.bz2
 
-# Submitted upstream: http://www.cebix.net/pipermail/ginac-list/2018-July/002214.html
-Patch0:           ginac.cmake-find-python.patch
-Patch1:           ginac.excompiler-install.patch
-
 BuildRequires:    gcc-c++
 BuildRequires:    bison
 BuildRequires:    cln-devel
@@ -95,6 +91,8 @@ export CTEST_OUTPUT_ON_FAILURE=1
 %{_infodir}/*.info*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/ginac.pc
+%dir %{_libdir}/cmake
+%{_libdir}/cmake/ginac/
 
 %files utils
 %{_bindir}/*
diff --git a/sources b/sources
index 40ee1d1..03ef76d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ginac-1.7.9.tar.bz2) = c29b6792a8f824310dc968d6227d8eb8423d70b499a53041cfd2b76fde10de1dc65059be3652f98312711eb53e0fd5109e7429cc2d58a8b5ef89f10d4857d7b7
+SHA512 (ginac-1.8.0.tar.bz2) = 6cacd0d87ffae24118f2fbaed4d201ee2d3812a751becef1982308e91cf489543db14443439da9333f3620dc5c8b1c32587e1aff0bed69e6e334310dc64edf49