diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb9d2c9..8e86a36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,11 @@ macro_log_feature(SAPERA_FOUND "Teledyne DALSA Sapera" "Required to build Teledy
 find_package(XCLIB)
 macro_log_feature(XCLIB_FOUND "EPIX PIXCI" "Required to build EPIX PIXCI source element" "http://www.epixinc.com/" FALSE)
 
+if (WIN32)
+  # Windows distributions of GStreamer include ZLIB
+  set(ZLIB_ROOT ${GSTREAMER_ROOT})
+endif ()
+find_package(ZLIB)
 
 # Setup common environment
 include_directories(
diff --git a/cmake/modules/FindZlib.cmake b/cmake/modules/FindZlib.cmake
deleted file mode 100644
index e604b44..0000000
--- a/cmake/modules/FindZlib.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-FILE(TO_CMAKE_PATH "$ENV{ZLIB_DIR}" TRY1_DIR)
-FILE(TO_CMAKE_PATH "${ZLIB_DIR}" TRY2_DIR)
-FILE(GLOB ZLIB_DIR ${TRY1_DIR} ${TRY2_DIR})
-
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
-                           PATHS ${ZLIB_DIR}/include /usr/local/include /usr/include
-                           ENV INCLUDE DOC "Directory containing zlib.h include file")
-
-FIND_LIBRARY(ZLIB_LIBRARY NAMES z
-                          PATHS ${ZLIB_DIR}/bin ${ZLIB_DIR}/win32/bin ${ZLIB_DIR}/lib ${ZLIB_DIR}/win32/lib /usr/local/lib /usr/lib
-                          ENV LIB
-                          DOC "zlib library to link with"
-                          NO_SYSTEM_ENVIRONMENT_PATH)
-
-IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-   SET(ZLIB_FOUND TRUE)
-ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
diff --git a/sys/gentl/CMakeLists.txt b/sys/gentl/CMakeLists.txt
index 4660464..4406430 100644
--- a/sys/gentl/CMakeLists.txt
+++ b/sys/gentl/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries (${libname}
   ${GSTREAMER_LIBRARY}
   ${GSTREAMER_BASE_LIBRARY}
   ${GSTREAMER_VIDEO_LIBRARY}
-  ${GSTREAMER_INCLUDE_DIR}/../../lib/z.lib
+  ${ZLIB_LIBRARIES}
   )
 
 if (WIN32)