--- a/base/pngtov/CMakeLists.txt
+++ b/base/pngtov/CMakeLists.txt
@@ -1,7 +1,11 @@
 PROJECT(PNGTOV)
 
+FIND_PACKAGE(PNG REQUIRED)
+INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+ADD_DEFINITIONS(${PNG_DEFINITIONS})
+
 ADD_EXECUTABLE(pngtov pngtov.c)
-TARGET_LINK_LIBRARIES(pngtov via png)
+TARGET_LINK_LIBRARIES(pngtov via ${PNG_LIBRARY})
 
 INSTALL(TARGETS pngtov
         RUNTIME DESTINATION ${VIA_INSTALL_BIN_DIR}
--- a/vxlib/CMakeLists.txt
+++ b/vxlib/CMakeLists.txt
@@ -15,7 +15,7 @@
 #The library target "vx_static" has a default OUTPUT_NAME of "vx_static", can be changed with
 SET_TARGET_PROPERTIES(vx_static PROPERTIES ${VIA_LIBRARY_PROPERTIES} OUTPUT_NAME "vx")
 
-TARGET_LINK_LIBRARIES(vx m viaio ${MOTIF_LIBRARIES} ${X11_Xt_LIB} ${X11_LIBRARIES} ${LIB_XMU})
+TARGET_LINK_LIBRARIES(vx m viaio ${MOTIF_LIBRARIES} ${X11_Xt_LIB} ${X11_LIBRARIES} ${LIB_XMU} Xt)
 # MESSAGE(STATUS )
 
 # install library
