diff --git a/tools/winemaker b/tools/winemaker
index 418ee27893..fb8f5a5dbe 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -1788,7 +1788,7 @@ sub generate_project_files
       print FILEO "\t-\$(STRIP) \$(STRIPFLAGS) \$\@\n";
       print FILEO "\n";
       print FILEO "\$(${canon}_SPEC_SRCS:.spec=.spec.c): \$(${canon}_SPEC_SRCS:.spec) \$(${canon}_SPEC_SRCS:.spec=.tmp.o) \$(${canon}_RC_SRCS:.rc=.res)\n";
-      print FILEO "\t\$(WINEBUILD) -fPIC \$(${canon}_LIBRARY_PATH) \$(WINE_LIBRARY_PATH) -sym \$(${canon}_SPEC_SRCS:.spec=.tmp.o) -o \$\@ -spec \$(${canon}_SPEC_SRCS)\n";
+      print FILEO "\t\$(LD_PATH) \$(WINEBUILD) -fPIC \$(${canon}_LIBRARY_PATH) \$(WINE_LIBRARY_PATH) -sym \$(${canon}_SPEC_SRCS:.spec=.tmp.o) -o \$\@ -spec \$(${canon}_SPEC_SRCS)\n";
       print FILEO "\n";
       my $t_name=@$target[$T_NAME];
       if (@$target[$T_TYPE]!=$TT_DLL) {
@@ -2451,6 +2451,7 @@ AC_SUBST($1)
 
 dnl **** Try to find where winelib is located ****
 
+LD_PATH="";
 WINE_INCLUDE_ROOT="";
 WINE_INCLUDE_PATH="";
 WINE_LIBRARY_ROOT="";
@@ -2549,6 +2550,10 @@ if test -n "$LIBNTDLL_PATH" -a "-L$LIBNTDLL_PATH" != "$WINE_LIBRARY_PATH"
 then
   WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$LIBNTDLL_PATH"
 fi
+if test -n "$WINE_LIBRARY_PATH"
+then
+  LD_PATH="LD_LIBRARY_PATH=\"`echo $WINE_LIBRARY_PATH | sed -e 's/ *-L/:/g' -e 's/^://' -e 's/ *$//'`:\$\$LD_LIBRARY_PATH\""
+fi
 
 if test -z "$WINE_TOOL_PATH"
 then
@@ -2570,6 +2575,7 @@ then
   AC_MSG_ERROR([Could not find Wine's wrc tool])
 fi
 
+AC_SUBST(LD_PATH)
 AC_SUBST(WINE_INCLUDE_PATH)
 AC_SUBST(WINE_LIBRARY_PATH)
 
@@ -2747,13 +2753,15 @@ dnl End:
 # SPEC_SRCS    : interface definition files
 
 
-# Where is Winelib
+# Where is Wine
 
 WINE_INCLUDE_ROOT = @WINE_INCLUDE_ROOT@
 WINE_INCLUDE_PATH = @WINE_INCLUDE_PATH@
 WINE_LIBRARY_ROOT = @WINE_LIBRARY_ROOT@
 WINE_LIBRARY_PATH = @WINE_LIBRARY_PATH@
 
+LD_PATH           = @LD_PATH@
+
 # Where are the MFC
 
 ATL_INCLUDE_ROOT = @ATL_INCLUDE_ROOT@
@@ -2833,7 +2841,7 @@ CLEAN_FILES     = *.spec.c y.tab.c y.tab.h lex.yy.c \
 	$(CXX) -c $(ALLCXXFLAGS) -o $@ $<
 
 .rc.res:
-	$(WRC) $(ALLWRCFLAGS) -o $@ $<
+	$(LD_PATH) $(WRC) $(ALLWRCFLAGS) -o $@ $<
 
 .PHONY: all install uninstall clean distclean depend dummy