diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
index d88d6348a..fdb09cac0 100644
--- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
+++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
@@ -13,7 +13,9 @@ VALID_BUILDS = Host Ioc
 
 #-------------------------------------------------------
 
-LIBRARY += $(LOADABLE_LIBRARY)
+BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
+LOADABLE_LIB_PREFIX=
+LOADABLE_LIB_SUFFIX=.lib
 
 BORLAND_INC = $(BORLAND)\\include
 BORLAND_LIB = $(BORLAND)\\lib
@@ -187,7 +189,7 @@ OP_SYS_INCLUDES = -I$(BORLAND_INC)
 # specify dll .def file only if it exists
 #
 #DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
-DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
+DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(addsuffix .def,$*)))
 
 #
 #   A WIN32 dll has three parts:
diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86
index 98d58a992..37f01cb44 100644
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -16,7 +16,9 @@ PATH_FILTER = $(subst /,\\,$(1))
 
 #-------------------------------------------------------
 
-LIBRARY += $(LOADABLE_LIBRARY)
+BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
+LOADABLE_LIB_PREFIX=
+LOADABLE_LIB_SUFFIX=.lib
 
 #
 # "\ " forces gnu make to keep this as one token
@@ -202,7 +204,7 @@ WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_
 #
 # specify dll .def file only if it exists
 #
-DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
+DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$*)))
 
 #
 #	A WIN32 dll has three parts: