diff --git a/license-files.txt b/license-files.txt
index 3564e44..acad1f7 100644
--- a/license-files.txt
+++ b/license-files.txt
@@ -1,5 +1,4 @@
 autoconf/LICENSE.TXT
-CTMark/ClamAV/COPYING
 CTMark/consumer-typeset/LICENSE
 CTMark/kimwitu++/COPYING
 CTMark/kimwitu++/LICENSE.TXT
@@ -11,7 +10,6 @@ MultiSource/Applications/aha/LICENSE.TXT
 MultiSource/Applications/ALAC/decode/LICENSE
 MultiSource/Applications/ALAC/encode/LICENSE
 MultiSource/Applications/ALAC/LICENSE
-MultiSource/Applications/ClamAV/COPYING
 MultiSource/Applications/hbd/doc/COPYING
 MultiSource/Applications/hbd/LICENSE.TXT
 MultiSource/Applications/hexxagon/COPYING
diff --git a/llvm-test-suite.spec b/llvm-test-suite.spec
index 6a5099d..a18e4d6 100644
--- a/llvm-test-suite.spec
+++ b/llvm-test-suite.spec
@@ -6,12 +6,12 @@
 
 Name:		llvm-test-suite
 Version:	%{llvm_test_suite_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	C/C++ Compiler Test Suite
 
 License:	NCSA and BSD and GPLv1 and GPLv2+ and GPLv2 and MIT and Python and Public Domain and CRC32 and AML and Rdisc and ASL 2.0 and LGPLv3
 URL:		http://llvm.org
-# The LLVM Test Suite contains progrms with "BAD" or unknown licenses which should
+# The LLVM Test Suite contains programs with "BAD" or unknown licenses which should
 # be removed.  Some of the unknown licenses may be OK, but until they are reviewed,
 # we will remove them.
 # Use the pkg_test_suite.sh script to generate the test-suite tarball:
@@ -80,6 +80,12 @@ cp -R %{_builddir}/%{test_suite_srcdir}/* %{buildroot}%{_datadir}/llvm-test-suit
 
 
 %changelog
+* Tue Oct 15 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.8-3
+- Remove MultiSource/Applications/ClamAV directory because of viruses in input files
+
+* Thu Oct 10 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.8-2
+- Remove broken links in source tarball
+
 * Fri Jul 12 2024 Jesus Checa Hidalgo <jchecahi@redhat.com> - 18.1.8-1
 - 18.1.8 Release
 
diff --git a/pkg_test_suite.sh b/pkg_test_suite.sh
old mode 100644
new mode 100755
index 6aac54d..81d8b01
--- a/pkg_test_suite.sh
+++ b/pkg_test_suite.sh
@@ -38,12 +38,14 @@ POSSIBLY_BAD="\
 	MultiSource/Applications/Burg/ \
 	MultiSource/Benchmarks/MiBench/telecomm-FFT/"
 
+VIRUSES="\
+	MultiSource/Applications/ClamAV/"
 
 #siod: llvm.org/PR38648
 BUGGY="\
 	MultiSource/Applications/siod"
 
-for f in $UNKNOWN $BAD $POSSIBLY_BAD $BUGGY; do
+for f in $UNKNOWN $BAD $POSSIBLY_BAD $BUGGY $VIRUSES; do
 	test -d $test_suite_src/$f
 	rm -Rf $test_suite_src/$f
 	basedir=`dirname $f`
@@ -51,9 +53,28 @@ for f in $UNKNOWN $BAD $POSSIBLY_BAD $BUGGY; do
 	cmake_file=$test_suite_src/$basedir/CMakeLists.txt
 	test -f $cmake_file
 	sed -i s/add_subdirectory\($dir\)//g $cmake_file
+done
 
+# The llvm-test-suite now contains broken symlinks because
+# the link target was removed above, e.g.
+#
+#   /usr/share/llvm-test-suite/CTMark/7zip -> ../MultiSource/Benchmarks/7zip
+#   /usr/share/llvm-test-suite/CTMark/lencod -> ../MultiSource/Applications/JM/lencod
+#
+# To fix these algorithmically, we have to find all broken
+# symlinks and remove the add_subdirectory entry in the
+# CMakeLists.txt in their parent directory.
+broken_symlinks=$(find $test_suite_src -type l ! -exec test -e {} \; -print)
+for f in $broken_symlinks; do
+	test -L $f
+	rm -fv $f
+	basedir=`dirname $f`
+	dir=`basename $f`
+	cmake_file=$basedir/CMakeLists.txt
+	test -f $cmake_file
+	sed -i s/add_subdirectory\($dir\)//g $cmake_file
 done
 
 tar --transform=s/$test_suite_src/$test_suite_src.fedora/ --show-transformed-names -cJf $currentdir/$test_suite_src.fedora.tar.xz $test_suite_src
-pushd
+popd
 rm -Rf $tmpdir
diff --git a/sources b/sources
index 009482b..2c2a28a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (test-suite-18.1.8.src.fedora.tar.xz) = d9538aec6565ff2884939fb62a73d54fc8489660a73b990250991fa0bd4cea51936112c0302321392715fef24f6ae6836f9a6829cae154bd7208644b9d67b068
+SHA512 (test-suite-18.1.8.src.fedora.tar.xz) = 67f0ad86203d0e202fdd5755fc203efe0217e71f8d09f57d382a73135a228f90e5102c8a8b3a50c13b34e85a31475906609d450f427de721e8f79c436d415c79