diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS
index d4dd640f7..8079639e2 100644
--- a/docs/CONTRIBUTORS
+++ b/docs/CONTRIBUTORS
@@ -71,6 +71,7 @@ Markus Krause
 Marlon James
 Marshal Qiao
 Martin Schmidt
+Martin Stadler
 Matthew Ballance
 Michael Killough
 Michaël Lefebvre
diff --git a/verilator-config.cmake.in b/verilator-config.cmake.in
index f408721c4..7573d29ae 100644
--- a/verilator-config.cmake.in
+++ b/verilator-config.cmake.in
@@ -334,9 +334,14 @@ function(verilate TARGET)
 
   target_link_libraries(${TARGET} PUBLIC
     ${${VERILATE_PREFIX}_USER_LDLIBS}
-    "$<$<BOOL:$<TARGET_PROPERTY:VERILATOR_THREADED>>:${VERILATOR_MT_CFLAGS}>"
   )
 
+  if (${VERILATE_PREFIX}_THREADS OR ${VERILATE_PREFIX}_TRACE_THREADS)
+    target_link_libraries(${TARGET} PUBLIC
+      ${VERILATOR_MT_CFLAGS}
+    )
+  endif()
+
   target_compile_features(${TARGET} PRIVATE cxx_std_11)
 endfunction()