diff --git a/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt
index 26e7b850fb0..b32f8d5daba 100644
--- a/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt
@@ -14,6 +14,10 @@ include( CGAL_CreateSingleSourceCGALProgram )
 if(CGAL_ImageIO_FOUND)
   create_single_source_cgal_program( "convert_raw_image_to_inr.cpp" )
   create_single_source_cgal_program( "test_imageio.cpp" )
+  if(CGAL_ImageIO_USE_ZLIB)
+    target_link_libraries(convert_raw_image_to_inr ${ZLIB_LIBRARY})
+    target_link_libraries(test_imageio ${ZLIB_LIBRARY})
+  endif()
 else()
   message(STATUS "NOTICE: This demo needs the CGAL ImageIO library, and will not be compiled.")
 endif()
diff --git a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
index efa259766ba..30e558391e9 100644
--- a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
@@ -19,6 +19,9 @@ if ( CGAL_FOUND )
 
   if (WITH_CGAL_ImageIO) 
     create_single_source_cgal_program( "test_trilinear_interpolation.cpp" )
+  if(CGAL_ImageIO_USE_ZLIB)
+    target_link_libraries(test_trilinear_interpolation ${ZLIB_LIBRARY})
+  endif()
   else()
     message(STATUS "NOTICE: Some tests require the CGAL_ImageIO library, and will not be compiled.")
   endif()
diff --git a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt
index db85f313895..1a60880619f 100644
--- a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt
+++ b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt
@@ -44,10 +44,10 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
   find_package(Qt5 QUIET COMPONENTS OpenGL Xml Svg)
   find_package(QGLViewer )
   find_package(OpenGL    )
-  
+
   if ( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
 
-        
+
     include_directories( ${QGLVIEWER_INCLUDE_DIR} )
     add_definitions(${QGLVIEWER_DEFINITIONS})
 
@@ -57,7 +57,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
       option(SURFACE_MESH_DEMO_USE_MARCHING_CUBE "Embed a marching cube implementation in the Surface Mesh demo." ON)
       mark_as_advanced(SURFACE_MESH_DEMO_USE_MARCHING_CUBE)
     endif()
-    
+
     if(EXISTS ${PACKAGE_ROOT}/include/CGAL/Polyhedral_surface_3.h)
       option(SURFACE_MESH_DEMO_WITH_POLYHEDRAL_SURFACE "Compile the support for polyhedral surfaces." OFF)
       mark_as_advanced(SURFACE_MESH_DEMO_WITH_POLYHEDRAL_SURFACE)
@@ -80,22 +80,22 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
       set(sources ${sources} ${PACKAGE_ROOT}/../Marching_cube/src/mc/ply.c)
       add_definitions(-DCGAL_SURFACE_MESH_DEMO_USE_MARCHING_CUBE)
     endif()
-    
+
 
     qt5_generate_moc( "surface.h" "${CMAKE_CURRENT_BINARY_DIR}/moc_surface.cpp" )
 
     set( sources ${sources} moc_surface.cpp)
-    
+
     qt5_wrap_ui( uis ui/values_list.ui ui/mainwindow.ui ui/optionsdialog.ui ui/raw_image.ui )
-    
+
     qt5_add_resources( CGAL_Qt5_RESOURCE_FILES values_list.qrc surface_mesher.qrc  )
 
     add_executable  ( ${prj}  ${sources} ${uis} ${CGAL_Qt5_RESOURCE_FILES} ${CGAL_Qt5_MOC_FILES})
 
     qt5_use_modules(${prj} OpenGL Xml Svg)
-    
+
     add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${prj} )
-    
+
     set(VTK_LIBS "")
     find_package(VTK QUIET COMPONENTS vtkImagingGeneral  vtkIOImage NO_MODULE)
     if(VTK_FOUND)
@@ -113,9 +113,13 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
 
     # Link the executable to CGAL and third-party libraries
     target_link_libraries( ${prj} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
-    
+
     target_link_libraries( ${prj} ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${VTK_LIBS})
-    
+
+  if(CGAL_ImageIO_USE_ZLIB)
+    target_link_libraries(${prj} ${ZLIB_LIBRARY})
+  endif()
+
   else( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
     message(STATUS "NOTICE: This demo needs libQGLViewer, and will not be compiled.")
   endif( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
diff --git a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
index 36413fc32e0..de2fdb198a4 100644
--- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
+++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
@@ -19,6 +19,11 @@ if ( CGAL_FOUND AND CGAL_ImageIO_FOUND )
   create_single_source_cgal_program( "mesh_a_3d_gray_image.cpp" )
   create_single_source_cgal_program( "mesh_an_implicit_function.cpp" )
 
+  if(CGAL_ImageIO_USE_ZLIB)
+    target_link_libraries(mesh_a_3d_gray_image ${ZLIB_LIBRARY})
+    target_link_libraries(mesh_an_implicit_function ${ZLIB_LIBRARY})
+  endif()
+
 else()
   if(RUNNING_CGAL_AUTO_TEST)
     # Just to avoid a warning from CMake if that variable is set on the command line...