diff --git a/libjpeg/PKGBUILD b/libjpeg/PKGBUILD
index da48afae7..2cd332edc 100644
--- a/libjpeg/PKGBUILD
+++ b/libjpeg/PKGBUILD
@@ -1,6 +1,10 @@
-# $Id: PKGBUILD 70836 2010-03-02 03:21:48Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=libjpeg
 pkgver=8.0.2
@@ -26,4 +30,4 @@ build() {
   install -m644 jpegint.h $pkgdir/usr/include
 
   install -Dm644 README $pkgdir/usr/share/licenses/libjpeg/README
-}
+}
\ No newline at end of file
diff --git a/libpng/PKGBUILD b/libpng/PKGBUILD
index 5b88b2a1a..5c37cd6df 100644
--- a/libpng/PKGBUILD
+++ b/libpng/PKGBUILD
@@ -1,10 +1,14 @@
-# $Id: PKGBUILD 71181 2010-03-05 04:20:08Z pierre $
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Travis Willard <travis@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=libpng
 pkgver=1.4.4
+_apngver=1.4.4
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
@@ -13,7 +17,7 @@ license=('custom')
 depends=('zlib')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${pkgver}-apng.patch.gz")
+        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
 md5sums=('0342d1cedb9b9a80294dd1b1e2ec9ae9'
          'd5cd185e7da764a10ff9046d42449259')
 
@@ -22,19 +26,19 @@ build() {
 
   # Add animated PNG (apng) support
   # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "${srcdir}/libpng-${pkgver}-apng.patch" || return 1
+  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
 
-  #libtoolize --force --copy || return 1
-  #aclocal || return 1
-  #autoconf || return 1
-  #automake --add-missing || return 1
+  #libtoolize --force --copy
+  #aclocal
+  #autoconf
+  #automake --add-missing
 
-  ./configure --prefix=/usr || return 1
-  make ECHO=echo || return 1
-  make ECHO=echo DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
 
   cd contrib/pngminus
   make PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png
   install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/"
-  install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
-}
+  install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
\ No newline at end of file
diff --git a/libpng/libpng14-enable-read-dither.patch b/libpng/libpng14-enable-read-dither.patch
deleted file mode 100644
index 955b12ac6..000000000
--- a/libpng/libpng14-enable-read-dither.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur libpng-1.4.0-orig/pngconf.h libpng-1.4.0/pngconf.h
---- libpng-1.4.0-orig/pngconf.h	2010-01-27 20:38:27.000000000 -0500
-+++ libpng-1.4.0/pngconf.h	2010-01-27 20:44:44.000000000 -0500
-@@ -497,11 +497,9 @@
- #  ifndef PNG_NO_READ_INVERT
- #    define PNG_READ_INVERT_SUPPORTED
- #  endif
--#if 0 /* removed from libpng-1.4.0 */
- #  ifndef PNG_NO_READ_DITHER
- #    define PNG_READ_DITHER_SUPPORTED
- #  endif
--#endif /* 0 */
- #  ifndef PNG_NO_READ_BACKGROUND
- #    define PNG_READ_BACKGROUND_SUPPORTED
- #  endif