diff --git a/modular/llvm-compat18/llvm-compat.spec b/modular/llvm-compat18/llvm-compat.spec
index a768331..727ca50 100644
--- a/modular/llvm-compat18/llvm-compat.spec
+++ b/modular/llvm-compat18/llvm-compat.spec
@@ -1,7 +1,7 @@
 %global maj_ver 18
 %global min_ver 1
-%global patch_ver 6
-%global baserelease 0.1
+%global patch_ver 8
+%global baserelease 1
 
 # Limit build jobs on ppc64 systems to avoid running out of memory.
 %global _smp_mflags -j8
@@ -110,8 +110,8 @@ pushd llvm-build
 %endif
 	\
 	-DLLVM_TARGETS_TO_BUILD="X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF;WebAssembly" \
-	-DLLVM_ENABLE_LIBCXX:BOOL=OFF \
-	-DLLVM_ENABLE_ZLIB:BOOL=ON \
+	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
+	-DLLVM_ENABLE_EH=ON \
 	-DLLVM_ENABLE_FFI:BOOL=ON \
 	-DLLVM_ENABLE_RTTI:BOOL=ON \
 	-DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
@@ -119,21 +119,24 @@ pushd llvm-build
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DLLVM_INCLUDE_TESTS=OFF \
 	-DLLVM_INCLUDE_BENCHMARKS=OFF \
-	-DLLVM_ENABLE_PROJECTS="clang"  \
+	-DLLVM_ENABLE_PROJECTS=clang  \
 	-DLLVM_BUILD_DOCS=OFF \
-	-DLLVM_INCLUDE_DOCS=OFF \
-	-DCMAKE_INSTALL_PREFIX=%{install_prefix}
+	-DLLVM_INCLUDE_DOCS=OFF
 
-
-DESTDIR=%{buildroot} %__ninja %__ninja_common_opts
+%ninja_build LLVM
+%ninja_build libclang.so
+%ninja_build libclang-cpp.so
 
 popd
 
 %install
-cd ..
 
-DESTDIR=%{buildroot} %__ninja %__ninja_common_opts -l 8 -C llvm-build \
-    install-LLVM install-libclang install-clang-cpp
+mkdir -p %{buildroot}%{pkg_libdir}
+install -m 0755 ../llvm-build/lib/libLLVM.so.%{maj_ver}* %{buildroot}%{pkg_libdir}
+install -m 0755 ../llvm-build/lib/libclang.so.%{maj_ver}* %{buildroot}%{pkg_libdir}
+install -m 0755 ../llvm-build/lib/libclang-cpp.so.%{maj_ver}* %{buildroot}%{pkg_libdir}
+
+ln -sf libLLVM.so.%{maj_ver}.%{min_ver} %{buildroot}%{pkg_libdir}/libLLVM-%{maj_ver}.so
 
 # Create ld.so.conf.d entry
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
@@ -141,11 +144,6 @@ cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
 %{pkg_libdir}
 EOF
 
-# Remove unversioned symlinks
-rm -f %{buildroot}%{pkg_libdir}/libclang.so
-rm -f %{buildroot}%{pkg_libdir}/libclang-cpp.so
-rm -f %{buildroot}%{pkg_libdir}/libLLVM.so
-
 %check
 
 %post libs -p /sbin/ldconfig