diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index a16fd7983..4ffce2dbc 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit a16fd798383763b7bb5802b8c4d89ac5d45987e9
+Subproject commit 4ffce2dbc3a48ba1fc8142456630d584ab32ec57
diff --git a/hecl/extern/libpng/CMakeLists.txt b/hecl/extern/libpng/CMakeLists.txt
index 07c816118..561fb1b26 100644
--- a/hecl/extern/libpng/CMakeLists.txt
+++ b/hecl/extern/libpng/CMakeLists.txt
@@ -1,8 +1,8 @@
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
 find_library(PNG_LIB png)
 endif()
 
-if(WIN32 OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND)
+if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND)
 message("-- Using HECL's built-in libpng")
 include_directories(${ZLIB_INCLUDE_DIR})
 add_library(png