diff --git a/alsa-firmware/PKGBUILD b/alsa-firmware/PKGBUILD
new file mode 100644
index 000000000..b0e5f8429
--- /dev/null
+++ b/alsa-firmware/PKGBUILD
@@ -0,0 +1,38 @@
+#
+# 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>
+
+pkgname=alsa-firmware
+pkgver=1.0.23
+pkgrel=1
+pkgdesc="ALSA firmware package"
+arch=('i686' 'x86_64')
+url="http://alsa-project.org/"
+license=('GPL')
+options=(!strip)
+source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2)
+md5sums=('e3f755331d6d485f6fd697249b90f877')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR=$pkgdir install || return 1
+
+  # remove files which conflicts with kernel26-firmware
+  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_kernel.fw || return 1
+  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_minisrc.fw || return 1
+  rm -rf ${pkgdir}/lib/firmware/korg/k1212.dsp || return 1
+  rm -rf ${pkgdir}/lib/firmware/sb16/alaw_main.csp || return 1
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_capture.csp || return 1
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_init.csp || return 1
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_playback.csp || return 1
+  rm -rf ${pkgdir}/lib/firmware/sb16/mulaw_main.csp || return 1
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_ctrl.fw || return 1
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_dsp.fw || return 1
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1e_ctrl.fw || return 1
+  rm -rf ${pkgdir}/lib/firmware/yamaha/yss225_registers.bin || return 1
+}
+
diff --git a/alsa-lib/PKGBUILD b/alsa-lib/PKGBUILD
index 460a03d34..05b22d164 100644
--- a/alsa-lib/PKGBUILD
+++ b/alsa-lib/PKGBUILD
@@ -9,21 +9,26 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=alsa-lib
 pkgver=1.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
 depends=('glibc')
-optdepends=('python')
-makedepends=('python')
+optdepends=('python2')
+makedepends=('python2')
 license=('GPL')
 options=(!libtool)
 source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2)
+md5sums=('f48b50421d8a69d2d806d9c47e534f0d')
+sha1sums=('8abcd773f1686a182c08fd53f0d7b353cfcf9f56')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --with-pythonlibs="-lpthread -lm -ldl -lpython2.7" --with-pythonincludes=-I/usr/include/python2.7
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('f48b50421d8a69d2d806d9c47e534f0d')
diff --git a/alsa-oss/PKGBUILD b/alsa-oss/PKGBUILD
index 71888e3f4..67d5a069a 100644
--- a/alsa-oss/PKGBUILD
+++ b/alsa-oss/PKGBUILD
@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=alsa-oss
 pkgver=1.0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="OSS compatibility library"
 arch=(i686 x86_64)
 license=('GPL')
diff --git a/alsa-plugins/PKGBUILD b/alsa-plugins/PKGBUILD
index 0a8689300..e20cba7e9 100644
--- a/alsa-plugins/PKGBUILD
+++ b/alsa-plugins/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=alsa-plugins
 pkgver=1.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra alsa plugins"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
diff --git a/alsa-utils/PKGBUILD b/alsa-utils/PKGBUILD
index 984ce25bb..ce13b267e 100644
--- a/alsa-utils/PKGBUILD
+++ b/alsa-utils/PKGBUILD
@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=alsa-utils
 pkgver=1.0.23
-pkgrel=2
+pkgrel=3
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
diff --git a/cairo/PKGBUILD b/cairo/PKGBUILD
index e99161fcc..01df14667 100644
--- a/cairo/PKGBUILD
+++ b/cairo/PKGBUILD
@@ -7,23 +7,24 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=cairo
-pkgver=1.10.0
+pkgver=1.10.2
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.19.4' 'xcb-util>=0.3.6')
-makedepends=('pkgconfig' 'gtk-doc')
+depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.18.4' 'glib2>=2.24.0')
+makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702')
-
+source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
+        cairo-1.10.0-buggy_gradients.patch)
+sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
+          'e867f1020391686b972d5bedcce3c6d1193d7953')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/libpng13/libpng14/g' configure || return 1
+  patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-xcb --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+    --localstatedir=/var --disable-static
+  make
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/cairo/cairo-1.10.0-buggy_gradients.patch b/cairo/cairo-1.10.0-buggy_gradients.patch
new file mode 100644
index 000000000..cdb307664
--- /dev/null
+++ b/cairo/cairo-1.10.0-buggy_gradients.patch
@@ -0,0 +1,13 @@
+--- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200
++++ b/src/cairo-xlib-display.c	2010-08-04 11:58:28.000000000 +0200
+@@ -353,11 +353,7 @@
+     /* Prior to Render 0.10, there is no protocol support for gradients and
+      * we call function stubs instead, which would silently consume the drawing.
+      */
+-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
+     display->buggy_gradients = TRUE;
+-#else
+-    display->buggy_gradients = FALSE;
+-#endif
+     display->buggy_pad_reflect = FALSE;
+     display->buggy_repeat = FALSE;
diff --git a/gstreamer0.10-python/PKGBUILD b/gstreamer0.10-python/PKGBUILD
index 7f0d395f9..673cc5c7d 100644
--- a/gstreamer0.10-python/PKGBUILD
+++ b/gstreamer0.10-python/PKGBUILD
@@ -4,7 +4,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=gstreamer0.10-python
-pkgver=0.10.19
+pkgver=0.10.20
 pkgrel=2
 pkgdesc="Python bindings for GStreamer 0.10"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.30')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
-md5sums=('ddcef7d00bd88b0591cd6d910c36ec4b')
+md5sums=('d706ea52819305f698d80343a583b03b')
 
 build() {
   cd "${srcdir}/gst-python-${pkgver}"
diff --git a/gtk2/PKGBUILD b/gtk2/PKGBUILD
index ad34f8e5a..644ce0966 100644
--- a/gtk2/PKGBUILD
+++ b/gtk2/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gtk2
 pkgver=2.22.0
-pkgrel=1
+pkgrel=3
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
diff --git a/imagemagick/PKGBUILD b/imagemagick/PKGBUILD
index 6566149c9..1da262fb3 100644
--- a/imagemagick/PKGBUILD
+++ b/imagemagick/PKGBUILD
@@ -5,13 +5,13 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=imagemagick
-pkgver=6.6.6.3
+pkgver=6.6.6.10
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
-depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'freetype2' 'fontconfig'
+depends=('libtool' 'lcms' 'lcms2' 'libxt' 'gcc-libs' 'bzip2' 'freetype2' 'fontconfig'
 	 'libxext' 'fftw' 'liblqr')
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
 optdepends=('ghostscript: for Ghostscript support' 
@@ -24,7 +24,7 @@ options=('!makeflags' '!docs')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         libpng_mmx_patch_x86_64.patch 
 	perlmagick.rpath.patch)
-md5sums=('344106f992109344f589608acf1669ed'
+md5sums=('59e2da8333ef645ade5f490c270651a1'
 	 '069980fc2590c02aed86420996259302'
          'ff9974decbfe9846f8e347239d87e4eb')
 
diff --git a/libmicrohttpd/PKGBUILD b/libmicrohttpd/PKGBUILD
index e2d0624af..7624977ee 100755
--- a/libmicrohttpd/PKGBUILD
+++ b/libmicrohttpd/PKGBUILD
@@ -1,23 +1,28 @@
-# Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
-# Contributor: Kao Dome <kaodome@gmail.com>
-# Contributor: Dmitrij D. Czarkoff <czarkoff@gmail.com>
-# Contributor: Mathias Rohnstock <linksoft@gmx.de>
 pkgname=libmicrohttpd
-pkgver=0.4.6
-pkgrel=3
+pkgver=0.9.4
+pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libmicrohttpd/"
 license=('LGPL')
-depends=('curl' 'libgcrypt')
+options=(!libtool)
+depends=('gnutls')
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('61698da6aa04744ea076c327f66fc05a')
+md5sums=('31f37439095e1f7143af97207f03aa14')
 
 build() {
-cd $startdir/src/$pkgname-$pkgver
-./configure --prefix=/usr --disable-dependency-tracking --enable-largefile --enable-curl --enable-messages --with-pic
-make || return 1
-make DESTDIR=$pkgdir install || return 1
-cd src/include
-mv platform.h plibc.h $pkgdir/usr/include
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-dependency-tracking --enable-largefile \
+	--enable-curl --enable-messages --with-pic
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \
+	${pkgdir}/usr/include/$pkgname/platform.h
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \
+	${pkgdir}/usr/include/$pkgname/plibc.h
+  sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc
 }
diff --git a/pycairo/PKGBUILD b/pycairo/PKGBUILD
index ba714eafc..ba9efb303 100644
--- a/pycairo/PKGBUILD
+++ b/pycairo/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pycairo
 pkgver=1.8.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for the cairo graphics library"
 arch=('i686' 'x86_64')
 license=('LGPL' 'MPL')
diff --git a/python3/PKGBUILD b/python3/PKGBUILD
new file mode 100644
index 000000000..5639f45df
--- /dev/null
+++ b/python3/PKGBUILD
@@ -0,0 +1,64 @@
+pkgname=python3
+pkgver=3.1.3
+pkgrel=1
+_pybasever=3.1
+pkgdesc="Next generation of the python high-level scripting language"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.python.org"
+depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
+makedepends=('tk' 'sqlite3')
+optdepends=('tk: for tkinter')
+provides=('python3')
+replaces=('python3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
+        python-internal-expat.patch)
+md5sums=('ad5e5f1c07e829321e0a015f8cafe245'
+         '57fa26dd3353a697e8262d926aa035ad')
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # rather than copies shipped in the tarball
+  patch -Np0 -i ../python-internal-expat.patch
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  export OPT="${CFLAGS}"
+  export CPPFLAGS+="`pkg-config --cflags-only-I libffi`"
+  ./configure --prefix=/usr \
+              --enable-shared \
+              --with-threads \
+              --with-computed-gotos \
+              --enable-ipv6 \
+              --with-wide-unicode \
+              --with-system-ffi
+
+  make
+
+  # Run the upstream test suite
+  LD_LIBRARY_PATH=${srcdir}/Python-${pkgver}:${LD_LIBRARY_PATH} PYTHON=./python \
+     ./runtests.sh -x test_distutils
+  for testname in $(cat BAD); do
+     echo "== ${testname} =="
+     cat OUT/${testname}.out
+  done
+}
+
+package() {
+  cd "${srcdir}/Python-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  # clean-up reference to build directory
+  sed -i "s#$srcdir/Python-${pkgver}:##" $pkgdir/usr/lib/python3.1/config/Makefile
+
+  # Fix conflicts with python2 - python2 version is newer...
+  rm ${pkgdir}/usr/bin/2to3
+
+  # license
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
diff --git a/python3/python-internal-expat.patch b/python3/python-internal-expat.patch
new file mode 100644
index 000000000..b1b17f01d
--- /dev/null
+++ b/python3/python-internal-expat.patch
@@ -0,0 +1,33 @@
+--- setup.py	2010-11-26 06:56:26.000000000 -0500
++++ setup.py	2010-11-29 07:51:25.000000031 -0500
+@@ -1227,18 +1227,15 @@
+         #
+         # More information on Expat can be found at www.libexpat.org.
+         #
+-        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
+-        define_macros = [
+-            ('HAVE_EXPAT_CONFIG_H', '1'),
+-        ]
++        # Use system expat
++        expatinc = '/usr/include'
++        define_macros = []
+ 
+         exts.append(Extension('pyexpat',
+                               define_macros = define_macros,
+                               include_dirs = [expatinc],
++                              libraries = ['expat'],
+                               sources = ['pyexpat.c',
+-                                         'expat/xmlparse.c',
+-                                         'expat/xmlrole.c',
+-                                         'expat/xmltok.c',
+                                          ],
+                               ))
+ 
+@@ -1250,6 +1247,7 @@
+             exts.append(Extension('_elementtree',
+                                   define_macros = define_macros,
+                                   include_dirs = [expatinc],
++                                  libraries = ['expat'],
+                                   sources = ['_elementtree.c'],
+                                   ))
+         else:
diff --git a/taglib/PKGBUILD b/taglib/PKGBUILD
index c1732f1aa..5bda32276 100644
--- a/taglib/PKGBUILD
+++ b/taglib/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=taglib
 pkgver=1.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
 arch=('i686' 'x86_64')
 url="http://developer.kde.org/~wheeler/taglib.html"
diff --git a/upower/PKGBUILD b/upower/PKGBUILD
index fddbcbc0b..94d303883 100644
--- a/upower/PKGBUILD
+++ b/upower/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=upower
 pkgver=0.9.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"