diff --git a/tools/Makefile.in b/tools/Makefile.in
index aa4e137784d..d4fc3aa8356 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -41,7 +41,7 @@ bin2res: bin2res.o
 	$(CC) $(CFLAGS) -o bin2res bin2res.o
 
 winelauncher: winelauncher.in
-	sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' $(SRCDIR)/winelauncher.in >$@ || $(RM) $@
+	sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' -e 's,@dlldir\@,$(dlldir),g' $(SRCDIR)/winelauncher.in >$@ || $(RM) $@
 
 install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__)
 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
diff --git a/tools/winelauncher.in b/tools/winelauncher.in
index 162fc109878..8c1d9eb248d 100755
--- a/tools/winelauncher.in
+++ b/tools/winelauncher.in
@@ -37,7 +37,7 @@
 WINEBIN=@bindir@
 WINELIB=@libdir@
 WINESERVER=
-WINELIBDLLS=@libdir@
+WINEDLLPATH=@dlldir@
 
 #------------------------------------------------------------------------------
 #  Establish Color Scheme
@@ -145,18 +145,19 @@ if [ -x $WINEBIN/server/wineserver ] ; then
     WINESERVER=$WINEBIN/server/wineserver
 fi
 
-if [ -r $WINELIB/dlls/libntdll.so ] ; then
-    WINELIBDLLS=$WINELIB/dlls
+if [ -r $WINELIB/dlls/ntdll.dll.so ] ; then
+    WINEDLLPATH=$WINELIB/dlls
 fi
 
 
 #------------------------------------------------------------------------------
 #  Okay, set the paths and move on.
 #------------------------------------------------------------------------------
-export LD_LIBRARY_PATH=$WINELIB:$WINELIBDLLS:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$WINELIB:$LD_LIBRARY_PATH
 export PATH=$WINEBIN:$PATH
-export WINEDLLPATH=$WINELIBDLLS
 export WINELOADER=$WINEBIN/$WINE_BIN_NAME
+export WINEDLLPATH
+export WINESERVER
 
 info_flag=~/.wine/.no_prelaunch_window_flag
 debug_flag=~/.wine/.no_debug_window_flag