diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0251d65d0..034a5d8bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,36 +30,24 @@ find_package(OpenGL REQUIRED)
 find_package(Boost REQUIRED)
 find_package(Gettext REQUIRED)
 
-if(WIN32)
-  find_library(TAGLIB_LIBRARIES tag)
-  find_path(GLIB_INCLUDE_DIRS glib.h
-    PATH_SUFFIXES glib glib-2.0)
-  find_path(GLIBCONFIG_INCLUDE_DIRS glibconfig.h
-    PATH_SUFFIXES ../lib/glib/include ../lib/glib-2.0/include)
-  find_path(LIBXML_INCLUDE_DIRS libxml/parser.h
-    PATH_SUFFIXES libxml libxml2)
-  find_path(GSTREAMER_INCLUDE_DIRS gst/gst.h
-    PATH_SUFFIXES gstreamer-0.10)
-  find_library(GSTREAMER_LIBRARIES gstreamer-0.10)
-  find_library(GSTREAMER_BASE_LIBRARIES gstbase-0.10)
-  find_library(GLIB_LIBRARIES glib-2.0)
-  find_library(GOBJECT_LIBRARIES gobject-2.0)
-else(WIN32)
-  pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
-  pkg_check_modules(GSTREAMER gstreamer-0.10)
-  pkg_check_modules(GSTREAMER_BASE gstreamer-base-0.10)
-  pkg_check_modules(LIBVLC libvlc)
-  pkg_check_modules(LIBXINE libxine)
-  pkg_check_modules(GLIB glib-2.0)
-  pkg_check_modules(LIBXML libxml-2.0)
-  pkg_check_modules(GOBJECT gobject-2.0)
-  pkg_check_modules(LIBGPOD libgpod-1.0)
-  pkg_check_modules(GIO gio-2.0)
-  pkg_check_modules(IMOBILEDEVICE libimobiledevice-1.0)
-  pkg_check_modules(PLIST libplist)
-  pkg_check_modules(USBMUXD libusbmuxd)
-  pkg_check_modules(LIBMTP libmtp)
-endif(WIN32)
+pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
+pkg_check_modules(GSTREAMER gstreamer-0.10)
+pkg_check_modules(GSTREAMER_BASE gstreamer-base-0.10)
+pkg_check_modules(LIBVLC libvlc)
+pkg_check_modules(LIBXINE libxine)
+pkg_check_modules(GLIB glib-2.0)
+pkg_check_modules(LIBXML libxml-2.0)
+pkg_check_modules(GOBJECT gobject-2.0)
+pkg_check_modules(LIBGPOD libgpod-1.0)
+pkg_check_modules(GIO gio-2.0)
+pkg_check_modules(IMOBILEDEVICE libimobiledevice-1.0)
+pkg_check_modules(PLIST libplist)
+pkg_check_modules(USBMUXD libusbmuxd)
+pkg_check_modules(LIBMTP libmtp)
+
+if (WIN32)
+  find_package(ZLIB REQUIRED)
+endif (WIN32)
 
 find_library(LASTFM_LIBRARIES lastfm)
 find_path(LASTFM_INCLUDE_DIRS lastfm/ws.h)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 253799087..496f5aa16 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -661,6 +661,11 @@ if(HAVE_STATIC_SQLITE)
   target_link_libraries(clementine_lib qsqlite)
 endif(HAVE_STATIC_SQLITE)
 
+# Link against zlib on windows
+if (WIN32)
+  target_link_libraries(clementine_lib ${ZLIB_LIBRARIES})
+endif (WIN32)
+
 add_dependencies(clementine_lib qtsingleapplication)