diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake
index 1bfb373ee7..20116488a7 100644
--- a/cmake/Platform.cmake
+++ b/cmake/Platform.cmake
@@ -13,3 +13,6 @@ ELSE()
 	SET(PLATFORM_CXX_FLAGS "-Wall -Werror -fno-exceptions -std=c++0x")
   SET(PLATFORM_LIBS ${PLATFORM_LIBS} pthread dl)
 ENDIF()
+
+find_package(ZLIB REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIRS})
diff --git a/src/tools/type-generator/CMakeLists.txt b/src/tools/type-generator/CMakeLists.txt
index 1c4b64382e..53bb7cabb1 100644
--- a/src/tools/type-generator/CMakeLists.txt
+++ b/src/tools/type-generator/CMakeLists.txt
@@ -4,8 +4,6 @@ target_link_libraries(type_generator
   avian_jvm_finder
   avian_system
   avian_util
-  z
-  pthread
-  dl
+  ${ZLIB_LIBRARIES}
   ${PLATFORM_LIBS}
 )