diff --git a/packages/graphics/libpng-host/build b/packages/graphics/libpng-host/build
index 2fc79569a7..19109a0687 100755
--- a/packages/graphics/libpng-host/build
+++ b/packages/graphics/libpng-host/build
@@ -26,6 +26,8 @@ LIBPNG_DIR=`ls -d $BUILD/libpng-[0-9]*`
 
 setup_toolchain host
 
+export CPPFLAGS="$CPPFLAGS -I$ROOT/$TOOLCHAIN/include"
+
 cd $LIBPNG_DIR
 
 mkdir -p .build-host && cd .build-host
@@ -37,19 +39,4 @@ mkdir -p .build-host && cd .build-host
              --enable-shared \
 
 make
-
-mkdir -p $ROOT/$TOOLCHAIN/lib
-  cp -PR .libs/*.so* $ROOT/$TOOLCHAIN/lib
-  ln -sf libpng15.so $ROOT/$TOOLCHAIN/lib/libpng.so
-
-mkdir -p $ROOT/$TOOLCHAIN/lib/pkgconfig
-  cp -PR libpng.pc $ROOT/$TOOLCHAIN/lib/pkgconfig/libpng15.pc
-  ln -sf libpng15.pc $ROOT/$TOOLCHAIN/lib/pkgconfig/libpng.pc
-
-mkdir -p $ROOT/$TOOLCHAIN/include/libpng15
-  cp -PR ../png.h $ROOT/$TOOLCHAIN/include/libpng15
-  cp -PR ../pngconf.h $ROOT/$TOOLCHAIN/include/libpng15
-  cp -PR pnglibconf.h $ROOT/$TOOLCHAIN/include/libpng15
-  ln -sf libpng15/png.h $ROOT/$TOOLCHAIN/include/png.h
-  ln -sf libpng15/pngconf.h $ROOT/$TOOLCHAIN/include/pngconf.h
-  ln -sf libpng15/pnglibconf.h $ROOT/$TOOLCHAIN/include/pnglibconf.h
+make install
diff --git a/packages/graphics/libpng/build b/packages/graphics/libpng/build
index fdf5db59b8..82098963a8 100755
--- a/packages/graphics/libpng/build
+++ b/packages/graphics/libpng/build
@@ -21,6 +21,7 @@
 . config/options $1
 
 CFLAGS="$CFLAGS -fPIC -DPIC"
+export CPPFLAGS="$CPPFLAGS -I$SYSROOT_PREFIX/usr/include"
 
 cd $PKG_BUILD
 mkdir -p .build-target && cd .build-target
diff --git a/packages/graphics/libpng/meta b/packages/graphics/libpng/meta
index a98a9f6cee..02e3232013 100644
--- a/packages/graphics/libpng/meta
+++ b/packages/graphics/libpng/meta
@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.5.14"
+PKG_VERSION="1.6.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.libpng.org/"
-PKG_URL="$SOURCEFORGE_SRC/libpng/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$SOURCEFORGE_SRC/libpng/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="zlib"
 PKG_BUILD_DEPENDS="toolchain zlib"
 PKG_PRIORITY="optional"