diff --git a/community/mt-daapd/PKGBUILD b/community/mt-daapd/PKGBUILD
index c60caaf10..603b4f2a9 100644
--- a/community/mt-daapd/PKGBUILD
+++ b/community/mt-daapd/PKGBUILD
@@ -10,8 +10,8 @@ license=("LGPL")
 arch=('arm')
 backup=(etc/mt-daapd/mt-daapd.conf)
 depends=('libid3tag' 'gdbm' 'avahi')
-source=(http://dl.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
-		mt-daapd)
+source=(http://dl.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	mt-daapd)
 md5sums=('67bef9fb14d487693b0dfb792c3f1b05'
          '26cf6ff799ef06d262a8648d6890a250')
 
diff --git a/core/heimdal/PKGBUILD b/core/heimdal/PKGBUILD
index 37c5c5d40..887c42fb7 100644
--- a/core/heimdal/PKGBUILD
+++ b/core/heimdal/PKGBUILD
@@ -1,18 +1,22 @@
-# Maintainer: Krzysztof "hiciu" Warzecha <kwarzecha7@gmail.com>
+# $Id: PKGBUILD 53083 2009-09-26 02:00:46Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
 #
 ### Attention: remove old pkg before building - it links against itself! ###
 #
 
 pkgname=heimdal
 pkgver=1.2.1
-pkgrel=4
+pkgrel=7
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('arm')
 url="http://www.h5l.org/"
 license=('custom')
-depends=('db>=4.7' 'openssl' 'e2fsprogs' 'sqlite3')
+depends=('db>=4.8' 'openssl' 'e2fsprogs' 'sqlite3')
 backup=(etc/krb5.conf)
 options=('!libtool' '!emptydirs')
+install=heimdal.install
 source=(http://www.h5l.org/dist/src/${pkgname}-${pkgver}.tar.gz
 	001_all_heimdal-no_libedit.patch
 	002_all_heimal-fPIC.patch
@@ -25,6 +29,7 @@ source=(http://www.h5l.org/dist/src/${pkgname}-${pkgver}.tar.gz
 	heimdal-system_sqlite.patch
 	heimdal-r23235-kb5-libwind_la.patch
 	heimdal-r23238-kb5_locl_h-wind_h.patch
+	heimdal-autoconf-2.64.patch
 	heimdal-kdc.rc
 	kadmind.rc
 	kpasswd.rc)
@@ -40,12 +45,13 @@ md5sums=('6e5028077e2a6b101a4a72801ba71b9e'
          '949a389ebe7652861b2e178a7e0f1ed9'
          '072f6b2550693adb30117394b1dd354e'
          '7b4537b0e8bde95214211091e55eacf5'
+         '9d1d39c3506474bf8258a364700e716c'
          'e59650992b9541a30dfce727a194f6e0'
          '1f2f86a67bbfddb7af581d35fdca9627'
          'f8f1eca95b9d3f2b4ebf2417b71b81cf')
 
 build() {
-  [ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1
+  #[ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1
 
   cd ${srcdir}/heimdal-${pkgver}
   patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch || return 1
@@ -59,6 +65,7 @@ build() {
   patch -Np0 -i ${srcdir}/heimdal-system_sqlite.patch || return 1
   patch -Np2 -i ${srcdir}/heimdal-r23235-kb5-libwind_la.patch || return 1
   patch -Np2 -i ${srcdir}/heimdal-r23238-kb5_locl_h-wind_h.patch || return 1
+  patch -Np0 -i ${srcdir}/heimdal-autoconf-2.64.patch || return 1
 
   sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
 	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
@@ -111,14 +118,6 @@ build() {
 
   # Remove conflicts 
   rm ${pkgdir}/usr/share/man/man5/ftpusers.5*		# man-pages
-  rm ${pkgdir}/usr/share/info/dir
-  rm ${pkgdir}/usr/bin/compile_et
-  rm ${pkgdir}/usr/lib/libcom_err*
-
-  # Compress info pages
-  for page in heimdal hx509; do
-    gzip -9 ${pkgdir}/usr/share/info/${page}.info
-  done
 
   # Install the license
   install -d ${pkgdir}/usr/share/licenses/${pkgname}
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index fcb8cc83b..9abe079af 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -1,15 +1,15 @@
-#Maintainer: Manuel Rotter <rotter.manuel@gmail.com>
+# Maintainer: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libcap
-pkgver=2.16
+pkgver=2.17
 pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
-arch=(arm)
+arch=('arm')
 url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
 license=('GPL')
-depends=('glibc')
+depends=('glibc' 'attr')
 source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9e075fda242c4070ba76407064c13302')
+md5sums=('fa8c3841ce491b379de316a195e65da2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -17,5 +17,5 @@ build() {
   make prefix=/usr DESTDIR=${pkgdir} install
 
   rm ${pkgdir}/lib/*.a || return 1
-  chmod 755 ${pkgdir}/lib/libcap.so.* || return 1
+  chmod 755 ${pkgdir}/lib/libcap.so.${pkgver} || return 1
 }
diff --git a/core/libldap/PKGBUILD b/core/libldap/PKGBUILD
index d57ba450e..cbedf7f54 100644
--- a/core/libldap/PKGBUILD
+++ b/core/libldap/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=libldap
-pkgver=2.4.18
+pkgver=2.4.19
 pkgrel=1	
 pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
 arch=('arm')
@@ -14,7 +14,7 @@ makedepends=('tcp_wrappers' 'groff')
 options=('!libtool')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz
         ntlm.patch)
-md5sums=('fecd7a64b6d9a0eb79b817d2562956ed'
+md5sums=('4a6dab2711fcf141f19bb680bc335887'
          'dfa9eb6f2fd9d0a3dab0e1860923489e')
 
 build() {
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 50fc839b5..202ff532b 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 29414 2009-03-08 16:54:54Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-glib
 pkgver=0.80
 pkgrel=1
 pkgdesc="GLib bindings for DBUS"
-arch=(i686 x86_64)
+arch=('arm')
 license=('GPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 depends=('dbus-core>=1.2.4' 'glib2>=2.18.4')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('86ea60ba2118a1b9deafe8257f6a6a1a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index ae77c04d4..0c7f2a64d 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 17272 2008-10-27 16:25:58Z douglas $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-python
 pkgver=0.83.0
 pkgrel=2
 pkgdesc="Python bindings for DBUS"
-arch=(i686 x86_64)
+arch=('arm')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 depends=('dbus-glib>=0.76' 'python>=2.6')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('562c78876219bf458d79a041af18293d')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -19,4 +19,4 @@ build() {
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 }
-md5sums=('562c78876219bf458d79a041af18293d')
+
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 1f90e742b..eb61154b4 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,5 +1,3 @@
-# $Id: PKGBUILD 54331 2009-10-08 21:12:45Z andyrtr $
-#
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
@@ -9,7 +7,7 @@ pkgname=dovecot
 pkgver=1.2.6
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
-arch=('i686' 'x86_64')
+arch=('arm')
 url="http://dovecot.org/"
 license=("LGPL")
 depends=("pam>=1.0.4" "libmysqlclient>=5.1.38" "postgresql-libs>=8.4.1-1" "sqlite3>=3.6.18" "db>=4.8"
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 5702328b2..2616bce87 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,27 +1,28 @@
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
-pkgname=mysql
-pkgver=5.1.38
-pkgrel=1
+pkgbase=mysql
+pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
+pkgver=5.1.41
+pkgrel=3
 pkgdesc="A fast SQL database server"
 arch=('arm')
-backup=(etc/my.cnf etc/conf.d/mysqld)
-depends=("mysql-clients>=${pkgver}" 'tcp_wrappers' 'zlib' 'perl')
-makedepends=('libtool' 'patch')
-url=('http://www.mysql.com/')
-options=('!libtool')
-optdepends=('perl-dbi' 'perl-dbd-mysql')
 license=('GPL')
-source=(ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/mysql-${pkgver}.tar.gz
-        mysql-no-clients.patch
-        mysql-fix-libs.patch
-        mysqld
-        my.cnf
-        mysqld.conf.d)
+url=('http://www.mysql.com/')
+makedepends=('tcp_wrappers' 'zlib' 'perl' 'openssl' 'libtool' 'patch')
+options=('!libtool')
+source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz"
+        'mysqld'
+        'my.cnf'
+        'mysqld.conf.d')
+md5sums=('b5d39e8789174753f3c782959729e68c'
+         '7e1c46ccbd91553cc11df7199fbfca32'
+         '26589ea08b78fc38dd174caeb93b810c'
+	 '4a9077fc95ec6db1d5420e0cdc74d31c')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgbase}-${pkgver}
 
   # fix build with gcc 4.4
   # see http://bugs.archlinux.org/task/15242
@@ -29,41 +30,95 @@ build() {
   CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing"
   CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing"
 
-  patch -Np1 -i ${startdir}/src/mysql-no-clients.patch || return 1
-  patch -Np1 -i ${startdir}/src/mysql-fix-libs.patch || return 1
-
-  ./configure --prefix=/usr --libexecdir=/usr/sbin \
-  --localstatedir=/var --sysconfdir=/etc \
-  --without-debug --without-docs --without-readline \
-  --enable-local-infile --with-ssl \
-  --with-charset=latin1 --with-collation=latin1_general_ci \
-  --with-extra-charsets=complex --enable-thread-safe-client \
-  --with-libwrap \
-  --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,ndbcluster
-
-  pushd include || return
+  ./configure --prefix=/usr \
+    --libexecdir=/usr/sbin \
+    --localstatedir=/var \
+    --sysconfdir=/etc/mysql \
+    --without-docs \
+    --without-readline \
+    --with-ssl \
+    --with-libwrap \
+    --with-charset=utf8 \
+    --with-collation=utf8_general_ci \
+    --with-extra-charsets=complex \
+    --with-embedded-server \
+    --with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+    --enable-local-infile \
+    --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster
   make || return 1
-  popd
-    
+}
+
+package_libmysqlclient(){
+  pkgdesc="MySQL client libraries"
+  depends=('openssl' 'zlib' 'gcc-libs' 'tcp_wrappers')
+  
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  for dir in libmysql libmysql_r libmysqld; do
+    pushd ${dir} || return 1
+      make DESTDIR=${pkgdir} install
+    popd
+  done
+  
+  cd include
+  make DESTDIR=${pkgdir} install
+  # Copy missing includes
+  install -m644 *.h ${pkgdir}/usr/include/mysql
+
+  # mysql_config
+  cd ../scripts
+  make mysql_config
+  install -d ${pkgdir}/usr/bin
+  install -m755 mysql_config ${pkgdir}/usr/bin || return 1
+  
+  # create library symlinks in /usr/lib
+  ln -sf mysql/libmysqlclient.so.16 $pkgdir/usr/lib/libmysqlclient.so.16
+  ln -sf libmysqlclient.so.16 $pkgdir/usr/lib/libmysqlclient.so
+  ln -sf libmysqlclient.so.16 $pkgdir/usr/lib/libmysqlclient.so.1
+  ln -sf mysql/libmysqlclient_r.so.16  $pkgdir/usr/lib/libmysqlclient_r.so.16
+  ln -sf libmysqlclient_r.so.16 $pkgdir/usr/lib/libmysqlclient_r.so
+  ln -sf libmysqlclient_r.so.16 $pkgdir/usr/lib/libmysqlclient_r.so.1
+}
+
+package_mysql-clients(){
+  pkgdesc="MySQL client tools"
+  depends=("libmysqlclient>=${pkgver}")
+  
+  cd ${srcdir}/${pkgbase}-${pkgver}
   pushd libmysql
-  make link_sources get_password.lo || return
+    make link_sources get_password.lo || return
   popd
   
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
+  cd client
+  make DESTDIR=${pkgdir} install
 
-  rm -rf $pkgdir/usr/{mysql-test,sql-bench,lib,include}
-  install -D -m644 ../my.cnf ${startdir}/pkg/etc/my.cnf
-  install -D -m755 ../mysqld ${startdir}/pkg/etc/rc.d/mysqld
-  install -D -m644 ../mysqld.conf.d ${startdir}/pkg/etc/conf.d/mysqld
-  rm -f ${startdir}/pkg/usr/bin/mysql_config
-
-  # Cleanup files provided by the other packages
-  rm -rf $pkgdir/usr/{include,lib}
+  # Removing libmysqlclient stuff
+  rm -rf $pkgdir/usr/lib/
+  # These will be provided by mysql
+  rm -f ${pkgdir}/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
+}
+
+package_mysql(){
+  backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
+  install=mysql.install
+  depends=('mysql-clients')
+  optdepends=('perl-dbi' 'perl-dbd-mysql')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  pushd libmysql
+    make link_sources get_password.lo || return
+  popd
+  
+  make DESTDIR=${pkgdir} install
+
+  rm -rf ${pkgdir}/usr/{mysql-test,sql-bench,lib,include}
+  install -D -m644 ../my.cnf ${pkgdir}/etc/mysql/my.cnf
+  install -D -m755 ../mysqld ${pkgdir}/etc/rc.d/mysqld
+  install -D -m644 ../mysqld.conf.d ${pkgdir}/etc/conf.d/mysqld
+
+  # Cleanup files provided by the others packages
+  rm -f ${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest_embedded}
+  rm -rf ${pkgdir}/usr/{include,lib}
+
+  # create directory for PID and sock files
+  install -d ${pkgdir}/var/run/mysqld
 }
-md5sums=('8ee9bb80079bbd09499a28bc57d902e7'
-         '8dce7e2b9f1f6ed6eca8bd62144bad0a'
-         'd1921e85821a66196c24ef6e5346b572'
-         'c093cc7eef5934f56f8bc775b559904b'
-         '0ee035590ffc61d32de994f461fd2bd2'
-         '4a9077fc95ec6db1d5420e0cdc74d31c')
diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf
index 927b9c8de..f9d52e782 100644
--- a/extra/mysql/my.cnf
+++ b/extra/mysql/my.cnf
@@ -12,14 +12,14 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /tmp/mysql.sock
+socket		= /var/run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port		= 3306
-socket		= /tmp/mysql.sock
+socket		= /var/run/mysqld/mysqld.sock
 datadir		= /var/lib/mysql
 skip-locking
 key_buffer = 16M
diff --git a/extra/mysql/mysqld b/extra/mysql/mysqld
index 2a67c8884..7d49a825a 100755
--- a/extra/mysql/mysqld
+++ b/extra/mysql/mysqld
@@ -12,24 +12,6 @@ getPID() {
    echo $(pgrep -u mysql mysqld);
 }
 
-if [ ! `egrep '^mysql:' /etc/group` ]; then
-  stat_busy "Adding mysql group"
-  groupadd -g 89 mysql
-  stat_done
-fi
-if [ ! `egrep '^mysql:' /etc/passwd` ]; then
-  stat_busy "Adding mysql user"
-  useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
-  [ -d $MYSQLD_ROOT ] && chown -R mysql:mysql $MYSQLD_ROOT
-  stat_done
-fi
-
-if [ ! -d $MYSQLD_ROOT ]; then
-  mkdir $MYSQLD_ROOT
-  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql
-  chown -R mysql:mysql $MYSQLD_ROOT
-fi
-
 case "$1" in
   start)
     stat_busy "Starting MySQL"
@@ -50,7 +32,7 @@ case "$1" in
           stat_fail
           exit 1
         else
-          echo $(getPID) >/var/run/mysqld.pid
+          echo $(getPID) >/var/run/mysqld/mysqld.pid
           add_daemon mysqld
           stat_done
         fi
@@ -69,7 +51,7 @@ case "$1" in
         stat_fail
         exit 1
       else
-        rm -f /var/run/mysqld.pid &>/dev/null
+        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
         rm_daemon mysqld
         stat_done
       fi
diff --git a/extra/postgresql-libs/PKGBUILD b/extra/postgresql-libs/PKGBUILD
index bd2f85d1f..459b8ed5a 100644
--- a/extra/postgresql-libs/PKGBUILD
+++ b/extra/postgresql-libs/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 52072 2009-09-15 10:44:40Z douglas $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=postgresql-libs
 pkgver=8.4.1
 pkgrel=1
 pkgdesc="Libraries for use with PostgreSQL"
-arch=(i686 x86_64)
+arch=('arm')
 license=('BSD')
 url="http://www.postgresql.org/"
 depends=('openssl>=0.9.8b' 'zlib' 'readline>=6.0')
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 091fe82a3..5ff63408d 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 52074 2009-09-15 11:16:51Z douglas $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=postgresql
 pkgver=8.4.1
 pkgrel=1
 pkgdesc="A sophisticated object-relational DBMS"
-arch=(i686 x86_64)
+arch=('arm')
 license=('BSD')
 backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql')
 url="http://www.postgresql.org/"