diff --git a/musicbrainz/PKGBUILD b/musicbrainz/PKGBUILD
index 129a376be..1906cbd4e 100644
--- a/musicbrainz/PKGBUILD
+++ b/musicbrainz/PKGBUILD
@@ -1,32 +1,34 @@
-#
-# 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>
+# $Id: PKGBUILD 69566 2010-02-21 05:29:26Z allan $
+# Maintainer: 
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=musicbrainz
-pkgver=3.0.3
-pkgrel=1
-pkgdesc="Library That Provides Access to the MusicBrainz Server  "
-url="http://musicbrainz.org/"
+pkgver=2.1.5
+pkgrel=3
+pkgdesc="The second generation incarnation of the CD Index"
 arch=('i686' 'x86_64')
-license=('LGPL2.1')
-depends=('neon' 'libdiscid')
-makedepends=('cmake')
-source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz)
-md5sums=('f4824d0a75bdeeef1e45cc88de7bb58a')
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../libmusicbrainz-${pkgver} \
-      -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-      -DBUILD_SHARED_LIBS:BOOL=ON \
-      -DBUILD_STATIC_LIBS:BOOL=OFF
-  make
-}
+url="http://www.musicbrainz.org/index.html"
+license=('LGPL')
+depends=('expat>=2.0')
+makedepends=('python2')
+options=('!libtool')
+source=(ftp://ftp.musicbrainz.org/pub/$pkgname/libmusicbrainz-${pkgver}.tar.gz
+	'gcc4.3.patch')
 
-package() {
-  cd ${srcdir}/build
+
+build() {
+  cd ${srcdir}/lib${pkgname}-${pkgver}
+
+  patch -p1 -i ${srcdir}/gcc4.3.patch
+  ./configure --prefix=/usr
+  make || return 1
   make DESTDIR=${pkgdir} install
-}
\ No newline at end of file
+
+  cd python
+  python2 setup.py install --root=${pkgdir} || return 1
+}
+md5sums=('d5e19bb77edd6ea798ce206bd05ccc5f'
+         '9455555d03e3bd15d488ffdb2287ffa7')
diff --git a/tunepimp/PKGBUILD b/tunepimp/PKGBUILD
index 29efa276e..5712a5aa1 100644
--- a/tunepimp/PKGBUILD
+++ b/tunepimp/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=tunepimp
 pkgver=0.5.3
-pkgrel=7
+pkgrel=8
 pkgdesc="The TunePimp library (also referred to as libtunepimp) is a development library geared towards developers who wish to create MusicBrainz enabled tagging applications"
 url="http://www.musicbrainz.org/products/tunepimp/"
 arch=('i686' 'x86_64')
 license=('GPL')
 options=('!libtool' '!makeflags')
-makedepends=('python')
+makedepends=('python2')
 depends=('curl' 'musicbrainz' 'zlib' 'libmad' 'flac' 'libvorbis' 'readline' 'libmpcdec' 'libofa' 'taglib' 'libmp4v2')
 replaces=('trm')
 source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${pkgname}-${pkgver}.tar.gz
@@ -29,7 +29,7 @@ source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${pkgname}-${pkgver}.tar.gz
   make DESTDIR=${pkgdir} install
   # install python bindings
   cd python
-  python setup.py install --root=${pkgdir}
+  python2 setup.py install --root=${pkgdir}
 
   # fix includes for kdemultimedia
   cd ${pkgdir}/usr/include