diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cf0e6a8..3e1bff4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -441,7 +441,7 @@ endif # SYSTEM_OPENSSL
 ifeq ($(SYSTEM_LIBVISIO),YES)
 
 define gb_LinkTarget__use_visio
-$(call gb_LinkTarget_add_libs,$(1),-llibvisio)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS))
 
 endef
 
@@ -464,7 +464,7 @@ endif # SYSTEM_LIBVISIO
 ifeq ($(SYSTEM_LIBWPD),YES)
 
 define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_add_libs,$(1),-llibwpd)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS))
 
 endef
 
@@ -487,7 +487,7 @@ endif # SYSTEM_LIBWPD
 ifeq ($(SYSTEM_LIBWPG),YES)
 
 define gb_LinkTarget__use_wpg
-$(call gb_LinkTarget_add_libs,$(1),-llibwpg)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPG_LIBS))
 
 endef
 
@@ -510,7 +510,7 @@ endif # SYSTEM_LIBWPG
 ifeq ($(SYSTEM_LIBWPS),YES)
 
 define gb_LinkTarget__use_wps
-$(call gb_LinkTarget_add_libs,$(1),-llibwps)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS))
 
 endef