diff --git a/contrib/C_Layer/EXAMPLE/kmenu/Makefile b/contrib/C_Layer/EXAMPLE/kmenu/Makefile
index 1db1261cb1..c4f17c453d 100644
--- a/contrib/C_Layer/EXAMPLE/kmenu/Makefile
+++ b/contrib/C_Layer/EXAMPLE/kmenu/Makefile
@@ -11,7 +11,7 @@ LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \
 CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__  -std=gnu90
 
 INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
-LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/lib
+LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
 OBJPATH = $(CLAYER)/OBJ
 
diff --git a/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile b/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile
index 5cfef50890..b2535f1e3d 100644
--- a/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile
+++ b/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile
@@ -11,7 +11,7 @@ LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app-dynamic.lds \
 CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=gnu90 -mno-ms-bitfields
 
 INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
-LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/lib
+LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
 OBJPATH = $(CLAYER)/OBJ
 
diff --git a/contrib/C_Layer/EXAMPLE/rasterworks/Makefile b/contrib/C_Layer/EXAMPLE/rasterworks/Makefile
index 84f82d6686..0449b6e853 100644
--- a/contrib/C_Layer/EXAMPLE/rasterworks/Makefile
+++ b/contrib/C_Layer/EXAMPLE/rasterworks/Makefile
@@ -11,7 +11,7 @@ LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \
 CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__
 
 INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
-LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/lib
+LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
 OBJPATH = $(CLAYER)/OBJ
 
diff --git a/contrib/sdk/samples/cairo/Makefile b/contrib/sdk/samples/cairo/Makefile
index 3698180587..e099fec21c 100644
--- a/contrib/sdk/samples/cairo/Makefile
+++ b/contrib/sdk/samples/cairo/Makefile
@@ -8,7 +8,7 @@ LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds --image-base
 CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
 
 INCLUDES= -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/cairo/src -I $(SDK_DIR)/sources/freetype/include
-LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/lib
+LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
 SOURCES = cairo.c	\
 	  $(NULL)
diff --git a/contrib/sdk/samples/freetype/txview/Makefile b/contrib/sdk/samples/freetype/txview/Makefile
index 7433bafb0b..ec8989604c 100644
--- a/contrib/sdk/samples/freetype/txview/Makefile
+++ b/contrib/sdk/samples/freetype/txview/Makefile
@@ -12,7 +12,7 @@ CFLAGS = -c -O2 -msse2 -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -U
 
 INCLUDES= -I./winlib -I./pxdraw -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include
 INCLUDES+= -I $(CONTRIB_DIR)/toolchain/binutils/bfd -I $(CONTRIB_DIR)/toolchain/binutils/include
-LIBPATH:= -L./ -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/lib
+LIBPATH:= -L./ -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
 LIB_SRCS= 			\
 	  pxdraw/context.c	\