diff --git a/castxml.spec b/castxml.spec
index fcfee56..2d84b3c 100644
--- a/castxml.spec
+++ b/castxml.spec
@@ -1,5 +1,12 @@
+%if %{?fedora}%{!?fedora:0} >= 32 || %{?rhel}%{!?rhel:0} >= 9
+%undefine __cmake_in_source_build
+%global oldcmakemacro 0
+%else
+%global oldcmakemacro 1
+%endif
+
 Name:		castxml
-Version:	0.3.1
+Version:	0.3.4
 Release:	1%{?dist}
 Summary:	C-family abstract syntax tree XML output tool
 
@@ -28,19 +35,26 @@ may support alternative output formats.
 %setup -q -n CastXML-%{version}
 
 %build
+%if %{oldcmakemacro}
+mkdir %{_vpath_builddir}
+pushd %{_vpath_builddir}
+%endif
 %cmake -DCastXML_INSTALL_DOC_DIR:STRING=share/doc/%{name} \
        -DCastXML_INSTALL_MAN_DIR:STRING=share/man \
        -DCLANG_RESOURCE_DIR:PATH=$(clang -print-file-name=include)/.. \
        -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-%if %{?fedora}%{!?fedora:0} >= 31
        -DCLANG_LINK_CLANG_DYLIB:BOOL=ON \
-%endif
        -DBUILD_TESTING:BOOL=ON \
-       -DSPHINX_MAN:BOOL=ON .
-make %{?_smp_mflags}
+       -DSPHINX_MAN:BOOL=ON \
+%if %{oldcmakemacro}
+       ..
+popd
+%endif
+
+%make_build -C %{_vpath_builddir}
 
 %install
-make %{?_smp_mflags} install DESTDIR=%{buildroot}
+%make_install -C %{_vpath_builddir}
 rm %{buildroot}%{_pkgdocdir}/LICENSE
 rm %{buildroot}%{_pkgdocdir}/NOTICE
 
@@ -59,6 +73,10 @@ ctest %{?_smp_mflags}
 %license LICENSE NOTICE
 
 %changelog
+* Wed Jul 22 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 0.3.4-1
+- Update to version 0.3.4
+- Adapt to new cmake rpm macro
+
 * Tue Feb 18 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 0.3.1-1
 - Update to version 0.3.1
 - Drop cling-cpp.so linking patch - accepted upstream
diff --git a/sources b/sources
index 4db10b3..b164e20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (castxml-0.3.1.tar.gz) = 79b953d5fece5a563a6132ee99156135dee02efaf5411e78846b1e9c66aa86c222f376f416bf980a66697f8835014c069f5adcee8cf63997949ba567a2a57377
+SHA512 (castxml-0.3.4.tar.gz) = 41cda66712d2382888df20adbe393c42ce24f2af7f13b4cb534fd490b5a0b69080d6aae9390893114621f4a628f910c2e735d74a5c8156458250e617a15684b2