diff --git a/Codecs/CodecPNG/CMakeLists.txt b/Codecs/CodecPNG/CMakeLists.txt
index 8fd4dce..31b42de 100644
--- a/Codecs/CodecPNG/CMakeLists.txt
+++ b/Codecs/CodecPNG/CMakeLists.txt
@@ -27,15 +27,16 @@ endif()
 
 
 add_subdirectory(${zlibFolder} ./external/zlib)
-set(ZLIB_INCLUDE_DIRS ${zlibFolder})
+
+list(APPEND ZLIB_INCLUDE_DIRS "${zlibFolder}")
+list(APPEND ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/external/zlib")
 set(ZLIB_LIBRARIES zlib)
 
 #LibPNG
 option(PNG_SHARED       "Build shared lib" ON)
 option(PNG_STATIC       "Build static lib" OFF)
 option(PNG_TESTS        "Build libpng tests" OFF)
-option(PNG_FIX          "Build pngfix" OFF)
-option(PNG_FIX_ITXT     "Build pngfix itext" OFF)
+option(PNG_EXECUTABLES  "Build libpng executables" OFF)
 option(PNG_BUILD_ZLIB   "Custom zlib Location, else find_package is used" ON)
 
 
diff --git a/External/libpng b/External/libpng
index 1ffe74e..5f68c5d 160000
--- a/External/libpng
+++ b/External/libpng
@@ -1 +1 @@
-Subproject commit 1ffe74eb6445f530b54d189469c5ee4bbc2243f6
+Subproject commit 5f68c5d79eb5a6c678a449fcab16f2456a83931c