diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45c17bc..fcf30f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,17 +32,19 @@ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
 SET(SDL2_ALL_LIBRARIES ${SDL2_LIBRARY})
 SET(SDL2_ALL_PKGCONFIG_MODULES sdl2)
 SET(SDL2PP_EXTRA_LIBRARIES ${SDL2MAIN_LIBRARY})
+SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES ${SDL2MAIN_LIBRARY})
 
 IF(MINGW)
-	FIND_LIBRARY(MINGW32_LIBRARY NAMES mingw32)
+	SET(MINGW32_LIBRARY "mingw32" CACHE STRING "mingw32 library")
 	SET(SDL2PP_EXTRA_LIBRARIES ${MINGW32_LIBRARY} ${SDL2PP_EXTRA_LIBRARIES})
+	SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES "-l${MINGW32_LIBRARY} ${SDL2PP_EXTRA_PKGCONFIG_LIBRARIES}")
 ENDIF(MINGW)
 
 IF(SDL2PP_WITH_IMAGE)
 	FIND_PACKAGE(SDL2_image REQUIRED)
 	SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR})
 	SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_IMAGE_LIBRARY})
-	SET(SDL2_ALL_PKGCONFIG_MODULES ${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image)
+	SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image")
 ELSE(SDL2PP_WITH_IMAGE)
 	MESSAGE(STATUS "SDL2_image support disabled")
 ENDIF(SDL2PP_WITH_IMAGE)
@@ -51,7 +53,7 @@ IF(SDL2PP_WITH_TTF)
 	FIND_PACKAGE(SDL2_ttf REQUIRED)
 	SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIR})
 	SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_TTF_LIBRARY})
-	SET(SDL2_ALL_PKGCONFIG_MODULES ${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf)
+	SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf")
 ELSE(SDL2PP_WITH_TTF)
 	MESSAGE(STATUS "SDL2_ttf support disabled")
 ENDIF(SDL2PP_WITH_TTF)
@@ -60,7 +62,7 @@ IF(SDL2PP_WITH_MIXER)
 	FIND_PACKAGE(SDL2_mixer REQUIRED)
 	SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR})
 	SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_MIXER_LIBRARY})
-	SET(SDL2_ALL_PKGCONFIG_MODULES ${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer)
+	SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer")
 ELSE(SDL2PP_WITH_MIXER)
 	MESSAGE(STATUS "SDL2_mixer support disabled")
 ENDIF(SDL2PP_WITH_MIXER)
@@ -254,7 +256,6 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 	JOIN_QUOTED("${SDL2PP_EXTRA_LIBRARIES}" SDL2PP_EXTRA_LIBRARIES_STR)
 	JOIN_QUOTED("${SDL2_ALL_LIBRARIES}" SDL2_ALL_LIBRARIES_STR)
 	JOIN_QUOTED("${SDL2_ALL_INCLUDE_DIRS}" SDL2_ALL_INCLUDE_DIRS_STR)
-	JOIN_SIMPLE("${SDL2_ALL_PKGCONFIG_MODULES}" SDL2_ALL_PKGCONFIG_MODULES_STR)
 
 	CONFIGURE_FILE(
 		sdl2pp.pc.in
diff --git a/sdl2pp.pc.in b/sdl2pp.pc.in
index a00040c..304f647 100644
--- a/sdl2pp.pc.in
+++ b/sdl2pp.pc.in
@@ -6,7 +6,7 @@ includedir=${prefix}/include
 Name: sdl2pp
 Description: C++11 bindings/wrappers for SDL2
 Version: @SDL2PP_VERSION@
-Requires: @SDL2_ALL_PKGCONFIG_MODULES_STR@
+Requires: @SDL2_ALL_PKGCONFIG_MODULES@
 Conflicts:
-Libs: @SDL2PP_EXTRA_LIBRARIES_STR@ -L${libdir} -lSDL2pp
+Libs: @SDL2PP_EXTRA_PKGCONFIG_LIBRARIES@ -L${libdir} -lSDL2pp
 Cflags: -I${includedir}