diff --git a/libmatroska2/CMakeLists.txt b/libmatroska2/CMakeLists.txt
index 0b0c88a7..bf192714 100644
--- a/libmatroska2/CMakeLists.txt
+++ b/libmatroska2/CMakeLists.txt
@@ -52,7 +52,8 @@ target_include_directories("matroska2" PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_
 
 if (CONFIG_ZLIB)
   if(ZLIB_FOUND)
-    target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:z>)
+    target_include_directories("matroska2" PRIVATE ${ZLIB_INCLUDE_DIRS})
+    target_link_libraries("matroska2" PRIVATE ${ZLIB_LIBRARIES})
   else()
     target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:zlib>)
   endif()
diff --git a/libmatroska2/matroskamain.c b/libmatroska2/matroskamain.c
index 25e911d4..4b78635a 100644
--- a/libmatroska2/matroskamain.c
+++ b/libmatroska2/matroskamain.c
@@ -28,10 +28,8 @@
 #include "matroska2/matroska.h"
 #include "matroska2/matroska_sem.h"
 #include "matroska2/matroska_classes.h"
-#if defined(HAVE_ZLIB)
-#include "zlib/zlib.h"
-#elif defined(CONFIG_ZLIB)
-#include "zlib.h"
+#if defined(CONFIG_ZLIB)
+#include <zlib.h>
 #endif
 #if defined(CONFIG_BZLIB)
 #include <bzlib.h>