diff --git a/source/codeblocks/AssaultCube.cbp b/source/codeblocks/AssaultCube.cbp
index 7ba43fe2..d91dbaf3 100644
--- a/source/codeblocks/AssaultCube.cbp
+++ b/source/codeblocks/AssaultCube.cbp
@@ -41,7 +41,7 @@
 			<Add library="enet" />
 			<Add library="OpenAL32" />
 			<Add library="..\lib\libvorbisfile.lib" />
-			<Add library="jpeg" />
+			<Add library="..\lib\libjpeg-static-mt.lib" />
 			<Add library="..\lib\libintl.lib" />
 			<Add library="ws2_32" />
 			<Add library="winmm" />
diff --git a/source/lib/jpeg.lib b/source/lib/jpeg.lib
deleted file mode 100644
index 47bde251..00000000
Binary files a/source/lib/jpeg.lib and /dev/null differ
diff --git a/source/src/Makefile b/source/src/Makefile
index 27581ac8..71580f99 100644
--- a/source/src/Makefile
+++ b/source/src/Makefile
@@ -16,7 +16,7 @@ endif
 ifneq (,$(findstring MINGW,$(PLATFORM)))
 WINDRES= windres
 CLIENT_INCLUDES= $(INCLUDES) -I../include
-CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -ljpeg -llibintl -lws2_32 -lwinmm
+CLIENT_LIBS= -mwindows -L../lib -lSDL -lSDL_image -lzdll -lopengl32 -lenet -lOpenAL32 -llibvorbisfile -llibjpeg-static-mt -llibintl -lws2_32 -lwinmm
 else
 override CXXFLAGS+= -rdynamic
 CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`