diff --git a/ginac.excompiler-install.patch b/ginac.excompiler-install.patch
new file mode 100644
index 0000000..544b471
--- /dev/null
+++ b/ginac.excompiler-install.patch
@@ -0,0 +1,10 @@
+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 612bdcd..9b020ed 100644
--- a/ginac.spec
+++ b/ginac.spec
@@ -1,15 +1,15 @@
-%define __cmake_in_source_build 1
 %global so_ver 6
 
 Name:             ginac
 Version:          1.7.9
-Release:          4%{?dist}
+Release:          5%{?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
@@ -62,12 +62,12 @@ the tool "viewgar" which displays the contents of GiNaC archives.
 sed -i 's| @GINACLIB_RPATH@||' ginac.pc.{in,cmake}
 
 %build
-%cmake -DCMAKE_INSTALL_RPATH="" -DLIBEXECDIR=%{_libexecdir} .
-%make_build
-make -C doc/tutorial/ ginac_html
+%cmake -DCMAKE_INSTALL_RPATH="" -DLIBEXECDIR=%{_libexecdir}
+%cmake_build
+%cmake_build --target ginac_html
 
 %install
-%make_install
+%cmake_install
 rm -frv %{buildroot}%{_infodir}/dir
 find %{buildroot} -name '*.la' -delete -print
 
@@ -79,7 +79,7 @@ done
 
 %check
 export CTEST_OUTPUT_ON_FAILURE=1
-make check
+%cmake_build --target check
 
 %files
 %license COPYING
@@ -89,7 +89,7 @@ make check
 
 %files devel
 %doc AUTHORS NEWS README
-%doc doc/tutorial/ginac.html
+%doc %{_vpath_builddir}/doc/tutorial/ginac.html
 %{_includedir}/ginac/
 %{_infodir}/*.info*
 %{_libdir}/*.so
@@ -99,6 +99,9 @@ make check
 %{_bindir}/*
 
 %changelog
+* Sun Oct 25 2020 Till Hofmann <thofmann@fedoraproject.org> - 1.7.9-5
+- Adapt to cmake out-of-source build
+
 * Wed Sep 23 2020 Jeff Law <law@redhat.com> - 1.7.9-4
 - Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes