diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index 7c15e2401..c4a881cbe 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -96,6 +96,8 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
 #	feature_history-notifications-enable-disable-kde#119207.patch
 
 #	feature_kdm-plymouth.patch
+	shutdown-fix.patch
+	sensors-fix.patch
 	)
 
 md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
@@ -132,6 +134,8 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #        '894815a80f99a9a0dee1adbcda49b161' #  feature_battery-tooltip.patch
 #        '9b97ac1b4deb8d0c8ca7afffb80b4320' #  feature_history-notifications-enable-disable-kde#119207.patch
 #        '42b3b5e09372c57910c3435e63e2dfd6' #  feature_kdm-plymouth.patch
+         'c542f58979cf9cb2299dd42f63e6fd72' #  shutdown-fix.patch
+         'ecf3a9d6af9bdd3db0189e06ddf21034' #  sensors-fix.patch
          )
 
 #
@@ -144,7 +148,7 @@ build()
 	# branch update
 	if [ "$_branchupdate" = "yes" ] ; then
 		msg "applying branch update ..."
-		patch -p0 -i $startdir/branch-update-r*.patch || return 1
+		patch -p0 -i $startdir/branch-update-r*.patch
 	else
 		warning "branch updates disabled ..."
 		warning "if you want to make use of it, run branch_updater.sh"
@@ -153,32 +157,35 @@ build()
 
 	msg "applying main patchset ..."
 
-	patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch || return 1
-	patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch || return 1
-	patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch || return 1
-	patch -Np1 -i ${srcdir}/04_plasma_kickoff_url.patch || return 1
-#	patch -Np1 -i ${srcdir}/05_plasma_desktop_defaults.patch || return 1
-	patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch || return 1
-	patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch || return 1
-	patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch || return 1
+	patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch
+	patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch
+	patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch
+	patch -Np1 -i ${srcdir}/04_plasma_kickoff_url.patch
+#	patch -Np1 -i ${srcdir}/05_plasma_desktop_defaults.patch
+	patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch
+	patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch
+	patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch
 
 
 	msg "applying fixes ..."
-	patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch || return 1
-	patch -Np0 -i ${srcdir}/fix_terminate-server.patch || return 1
-#	patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch || return 1
-	patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch || return 1
-	patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch || return 1
+	patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch
+	patch -Np0 -i ${srcdir}/fix_terminate-server.patch
+#	patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch
+	patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
+	patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
+	patch -Np1 -i ${srcdir}/shutdown-fix.patch
 
 # FIXME: update feature patches
 #	msg "applying feature patches ..."
-# 	patch -Np1 -i ${srcdir}/feature_plasma-transparent-panel-v4-rb#472.patch || return 1
-# 	patch -Np1 -i ${srcdir}/feature_brightness-osd.patch || return 1
-# 	patch -Np1 -i ${srcdir}/feature_battery-tooltip.patch || return 1
-# 	patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch || return 1
-# 	patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch || return 1
+# 	patch -Np1 -i ${srcdir}/feature_plasma-transparent-panel-v4-rb#472.patch
+# 	patch -Np1 -i ${srcdir}/feature_brightness-osd.patch
+# 	patch -Np1 -i ${srcdir}/feature_battery-tooltip.patch
+# 	patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch
+# 	patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch
+
+	msg "applying upstream patches ..."
+	patch -Np1 -i ${srcdir}/sensors-fix.patch
 
-	#msg "applying upstream patches ..."
 
 	msg "starting workspace build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -188,7 +195,7 @@ build()
                 -DWITH_PolkitQt=OFF \
 		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
 
-	make || return 1
+	make
 
 	msg "starting kcm_touchpad build ..."
 	cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
@@ -214,7 +221,7 @@ build()
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
 
-	make || return 1
+	make
 }
 
 
@@ -253,16 +260,16 @@ package_kdebase-workspace()
 	install=${_origname}.install
 
 	cd ${srcdir}/${_origname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 
 	cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 
 	cd ${srcdir}/kcm_tablet-1.1.3
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 
 	cd ${srcdir}/favorites-0.1
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 
 	# install pam configuration
 	install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
@@ -350,7 +357,7 @@ package_kdebase-workspace-doc()
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
 			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
+			make DESTDIR=${pkgdir} install
 		done
 }
 
@@ -364,7 +371,7 @@ package_kdebase-workspace-wallpapers()
 	splitdirs="wallpapers"
 		for i in ${splitdirs} ; do
 			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
+			make DESTDIR=${pkgdir} install
 		done
 
 	rm -rfv ${pkgdir}/usr/share/wallpapers/${_default_wp}
diff --git a/kdebase-workspace/sensors-fix.patch b/kdebase-workspace/sensors-fix.patch
new file mode 100644
index 000000000..2d9b70c52
--- /dev/null
+++ b/kdebase-workspace/sensors-fix.patch
@@ -0,0 +1,22 @@
+commit 23863a99399cbb274f6756146b3c08de2efa0c7f
+Author: John Tapsell <johnflux@gmail.com>
+Date:   Thu Apr 7 10:59:20 2011 +0100
+
+    Fix accidental removal of a #include, when adding freebsd support.  This broke the lmsensors at minimum
+    
+    BUG: 270246
+    BUG: 270246
+    CCMAIL: naylor.b.david@gmail.com
+
+diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
+index e780be6..9aae890 100644
+--- a/ksysguard/ksysguardd/modules.h
++++ b/ksysguard/ksysguardd/modules.h
+@@ -23,6 +23,7 @@
+ #ifndef KSG_MODULES_H
+ #define KSG_MODULES_H
+ 
++#include "config-ksysguardd.h"
+ #include "Command.h"
+ #include "conf.h"
+ #include "ksysguardd.h"
diff --git a/kdebase-workspace/shutdown-fix.patch b/kdebase-workspace/shutdown-fix.patch
new file mode 100644
index 000000000..b01ab7fba
--- /dev/null
+++ b/kdebase-workspace/shutdown-fix.patch
@@ -0,0 +1,11 @@
+--- kdebase-workspace-4.6.2/kdm/config.def~	2011-04-08 00:29:48.291941154 -0700
++++ kdebase-workspace-4.6.2/kdm/config.def	2011-04-08 00:32:04.738607619 -0700
+@@ -38,7 +38,7 @@
+ # define HALT_CMD	"/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
+ #elif defined(BSD) || defined(__linux__)
+-# define HALT_CMD	"/sbin/shutdown -p now"
++# define HALT_CMD	"/sbin/shutdown -h now"
+ # define REBOOT_CMD	"/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD	"/usr/sbin/halt"
diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD
index 3985dccbe..ac298fc5f 100644
--- a/kdenetwork/PKGBUILD
+++ b/kdenetwork/PKGBUILD
@@ -28,7 +28,7 @@ pkgname=('kdenetwork-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -39,8 +39,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
              'qca-ossl' "kdebase-workspace>=${_kdever}" 
              "kdebase>=${_kdever}" 'libvncserver' 'libmsn'
-             'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage'
-             'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5')
+             'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'ilbc' 'msilbc' 
+             'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer>=2.7.3' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5')
 
 source=($_mirror/${_origname}-$_kdever.tar.bz2 \
         'lisa.daemon')
@@ -137,7 +137,7 @@ package_kdenetwork-kopete()
 {
 	pkgdesc="Kopete, the instant messenger"
 	depends=("kdebase-runtime>=${_kdever}" "kdepimlibs>=${_kdever}"
-	         'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'libv4l' 'libgadu' 'meanwhile' 'mediastreamer')
+	         'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'v4l-utils' 'libgadu' 'meanwhile' 'mediastreamer' 'msilbc')
 	conflicts=("kdemod-${_origname}-kopete")
 	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
 	install=${_origname}.install
diff --git a/koffice-l10n/PKGBUILD b/koffice-l10n/PKGBUILD
index ad2337a75..7a71fcd1c 100644
--- a/koffice-l10n/PKGBUILD
+++ b/koffice-l10n/PKGBUILD
@@ -35,7 +35,7 @@ pkgname=('koffice-l10n-ca'
          'koffice-l10n-zh_cn'
          'koffice-l10n-zh_tw')
 pkgver=2.3.2
-pkgrel=2
+pkgrel=3
 arch=('any')
 url='http://www.koffice.org'
 license=('GPL')
@@ -364,11 +364,8 @@ package_koffice-l10n-gl() {
 }
 package_koffice-l10n-hu() {
         pkgdesc=('Hungarian Localization for Koffice')
-        cd $srcdir/build/gl
+        cd $srcdir/build/hu
         make DESTDIR=$pkgdir install
-        # temp fix
-        rm -vR $pkgdir/usr/share/locale/gl
-        rm -vR $pkgdir/usr/share/doc/kde/html/gl
 }
 package_koffice-l10n-it() {
         pkgdesc=('Italian Localization for Koffice')
@@ -402,11 +399,8 @@ package_koffice-l10n-nl() {
 }
 package_koffice-l10n-pl() {
         pkgdesc=('Polish Localization for Koffice')
-        cd $srcdir/build/gl
+        cd $srcdir/build/pl
         make DESTDIR=$pkgdir install
-        # temp fix
-        rm -vR $pkgdir/usr/share/locale/gl
-        rm -vR $pkgdir/usr/share/doc/kde/html/gl
 }
 package_koffice-l10n-pt() {
         pkgdesc=('Portugese Localization for Koffice')
diff --git a/support-pkg-akonadi/PKGBUILD b/support-pkg-akonadi/PKGBUILD
index 9945a1f20..c32c415d9 100644
--- a/support-pkg-akonadi/PKGBUILD
+++ b/support-pkg-akonadi/PKGBUILD
@@ -8,18 +8,18 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=akonadi
-pkgver=1.5.1
-pkgrel=3
+pkgver=1.5.2
+pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://www.akonadi-project.org'
 license=('LGPL')
-depends=('shared-mime-info' 'boost' 'mysql>=5.5.10' 'soprano>=2.6.0')
+depends=('shared-mime-info' 'boost' 'mysql>=5.5.11' 'soprano>=2.6.0')
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 install=$pkgname.install
 source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2"
         'qt-plugins-path.patch')
-md5sums=('4225b064cac6553c22cbeca9a8f93c25'
+md5sums=('1c69a74474389e35709171a329c77bed'
         '9e8ad893d8e8d7af2c4f89429e32e367')
 
 build() {
diff --git a/support-pkg-mediastreamer/PKGBUILD b/support-pkg-mediastreamer/PKGBUILD
index 39c034b10..8b54602fb 100644
--- a/support-pkg-mediastreamer/PKGBUILD
+++ b/support-pkg-mediastreamer/PKGBUILD
@@ -4,34 +4,23 @@
 # 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
-
-
-# original name (used for the source and pkgnames)
-_origname=mediastreamer
-
-pkgname=${_origname}
-pkgver=2.3.0
-pkgrel=1
-pkgdesc='A powerful and lightweighted streaming engine specialized for voice/video telephony applications'
+pkgname=mediastreamer
+pkgver=2.7.3
+pkgrel=2
+pkgdesc="A library written in C that allows you to create and run audio and video streams."
 arch=('i686' 'x86_64')
-url="http://www.linphone.org/index.php/eng/code_review/mediastreamer2"
+url="http://www.linphone.org"
 license=('GPL')
-depends=('ortp>=0.15.0' 'sdl>=1.2.14' 'libv4l>=0.6.3' 'speex' 'libtheora>=1.1.1' "ffmpeg>=0.5")
-makedepends=()
-groups=("kde-uninstall" "kde-support")
-options=('!splitdbg' '!splithdr')
-
-provides=("${_origname}=$pkgver")
-conflicts=("${_origname}")
-
-source=(http://mirror.cinquix.com/pub/savannah/linphone/mediastreamer/${_origname}-$pkgver.tar.gz)
-md5sums=('867d539cf11e942dcbfd08d4b3182397') # mediastreamer-2.3.0.tar.gz
+depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg' 'libxv')
+makedepends=('cmake' 'automoc4')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-$pkgver.tar.gz")
+md5sums=('5213307f557d86aa648f1a53a885138c')
 
 build() {
-  cd "$srcdir"/${_origname}-$pkgver
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+
+  cd "$srcdir"/$pkgname-$pkgver/
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+
 }
diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD
index 7cdbef1cb..e478b0997 100644
--- a/tools-pkg-appset-qt/PKGBUILD
+++ b/tools-pkg-appset-qt/PKGBUILD
@@ -3,8 +3,8 @@
 # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626
 
 pkgname=appset-qt
-pkgver=0.4.0
-pkgrel=1
+pkgver=0.4.2
+pkgrel=2
 pkgdesc="An advanced and feature rich Package Manager Frontend"
 arch=('i686' 'x86_64')
 url="http://appset.sourceforge.net/"
@@ -14,23 +14,25 @@ optdepends=('ccr: For Community Repository support')
 install=${pkgname}.install
 source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz
         http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz
-        http://chakra-project.org/sources/$pkgname/$pkgname-0.4.0-chakra.patch
-        http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.0.tar.gz
+        http://chakra-project.org/sources/$pkgname/$pkgname-0.4.2-chakra.patch
+        #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz
+        http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
         )
-md5sums=(4d0500ae33c8250dfa24c9b696ba7e30
+md5sums=(672dc9475c94baf614dd12922782c522
          87f5f278e3fe67ed2cd6165c2835d81b
-         724e4cea62d3b95dd63573e75dffe783
-         44ba1b52c438e05853fbaf202ae243b6  #appset-qt_ca-0.4.0.tar.gz
-         3b5c5027609eef9b43ad0f98c137c094  #appset-qt_de-0.4.0.tar.gz
-         84542e24121e93dc1c84b63c940c60e0  #appset-qt_el-0.4.0.tar.gz
-         ffb9f62a72805a1613a8847598e353ea  #appset-qt_es-0.4.0.tar.gz
-         f64d3552553bf28d12358aba2db4ca2a  #appset-qt_fr-0.4.0.tar.gz
-         b9238caf3c0bf3f7f2258c052d8addf6  #appset-qt_nl-0.4.0.tar.gz
+         eb097d3ceeae3d05eefc0a5717ced010
+         #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz
+         #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz
+         #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz
+         #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz
+         #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz
+         #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz
+         53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz
          )
 
 build() {
@@ -39,7 +41,7 @@ build() {
   cp -v ../*png Qt/AppSet-Qt
 
   # patch it for Chakra GNU/Linux
-  patch -Np1 -i ${startdir}/src/$pkgname-0.4.0-chakra.patch
+  patch -Np1 -i ${startdir}/src/$pkgname-0.4.2-chakra.patch
 
   # add chakra translations (check upstream)
   #patch -Np1 -i ${startdir}/src/add-spanish.patch
diff --git a/tools-pkg-bluedevil/PKGBUILD b/tools-pkg-bluedevil/PKGBUILD
index ae35cb91a..bf0634652 100644
--- a/tools-pkg-bluedevil/PKGBUILD
+++ b/tools-pkg-bluedevil/PKGBUILD
@@ -8,9 +8,9 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=bluedevil
-pkgver=1.0.2
-pkgrel=1
-pkgdesc='The new bluetooth stack for KDE, it’s composed of: KCM, KDED, KIO, Library and some other small applications'
+pkgver=1.1
+pkgrel=2
+pkgdesc='The new bluetooth stack for KDE, it is composed of: KCM, KDED, KIO, Library and some other small applications'
 arch=('i686' 'x86_64')
 url="http://gitorious.org/bluedevil"
 license=('GPL')
@@ -20,7 +20,7 @@ provides=(bluedevil)
 conflicts=(bluedevil-git)
 
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=("c0c814146098b865144957bc8b3bd7e7")
+md5sums=('240151ff99b81f630de51fa9f8230198')
 
 build(){
   cd ${srcdir}
diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD
index ac82f8fdc..18644e197 100644
--- a/tools-pkg-cbundle/PKGBUILD
+++ b/tools-pkg-cbundle/PKGBUILD
@@ -5,8 +5,8 @@
 # (c) 2010 Drake Justice
 
 pkgname=cbundle
-pkgver=0.4.5
-pkgrel=1
+pkgver=0.4.5.1
+pkgrel=2
 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse')
 makedepends=('qt' 'automoc4' 'kdebase-workspace')
 pkgdesc="A shared library for using Chakra software bundles"
@@ -15,13 +15,13 @@ license=('GPL')
 url="http://chakra-project.org/"
 
 source=("http://chakra-project.org/sources/cinstall/cbundle-$pkgver.tar.xz")
-md5sums=('0c762b2fd4219a48b413bb46f23d828b')
+md5sums=('d4ff21cbf6293edd9f134889768d1bbc')
 
 # create tarball: source PKGBUILD && mksource
 
 mksource() {
   git clone git://gitorious.org/chakra/cbundle.git
-  pushd jmc-88-cbundle
+  pushd cbundle
   popd
   tar -cvJf cbundle-${pkgver}.tar.xz cbundle/*
   md5sum cbundle-${pkgver}.tar.xz
@@ -29,7 +29,6 @@ mksource() {
 
 build() {
         cd "${srcdir}/cbundle"
-        
 
         cmake  \
           -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index dcdf4158a..94bcbec28 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,8 +6,8 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.4.5
-pkgrel=1
+pkgver=0.4.5.1
+pkgrel=2
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
 pkgdesc="Bundle Creator/Launcher and Package-Manager"
@@ -17,7 +17,7 @@ install=$pkgname.install
 url="http://chakra-project.org/"
 
 source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.xz")
-md5sums=('9d5cb8aeddfcc9675ff2235bd2139890')
+md5sums=('c7c22a279dc3f0f9e16ada74e5ebaf41')
 
 # create tarball: source PKGBUILD && mksource
 
diff --git a/tools-pkg-libbluedevil/PKGBUILD b/tools-pkg-libbluedevil/PKGBUILD
new file mode 100644
index 000000000..46f48a5b8
--- /dev/null
+++ b/tools-pkg-libbluedevil/PKGBUILD
@@ -0,0 +1,33 @@
+#
+# Chakra 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=libbluedevil
+pkgver=1.9
+pkgrel=1
+pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack'
+arch=('i686' 'x86_64')
+url="https://projects.kde.org/projects/playground/libs/libbluedevil"
+license=('GPL')
+depends=('qt' 'bluez')
+makedepends=('cmake')
+# source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+source=("ftp://ftp.belnet.be/packages/kde/unstable/libbluedevil/1.9/src/libbluedevil-1.9.tar.bz2")
+md5sums=('5f22614dfb840734da6e8b8710c2472e')
+
+build(){
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}
diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 5e4c19967..e85f0488c 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -8,8 +8,8 @@
 # package info
 #
 pkgname=tribe
-pkgver=2011.04_ms4
-pkgrel=2
+pkgver=2011.04_ms6
+pkgrel=4
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
@@ -23,10 +23,10 @@ replaces=('kdemod-tribe-svn' 'kdemod-tribe')
 conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
 options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS4.html")
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS6.html")
   
-md5sums=('34146b44bd0425f72c12a2c101a04b62'
-         '77351a268878e2a493bfd8c89fac1e41')
+md5sums=('a9560c8b4b0737d19aa06a967db37eea'
+         '416c5c801e34113b48055fc24d395cd9')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -54,7 +54,7 @@ build()
         cd "${srcdir}/$pkgname"
 
 	# workaround for bug https://bugzilla.novell.com/show_bug.cgi?id=656144
-	sed -i -e "s~sudo~kdesu~g" "${srcdir}/$pkgname/tribe.desktop"
+	#sed -i -e "s~sudo~kdesu~g" "${srcdir}/$pkgname/tribe.desktop"
 
 	# patches
 	#patch -Np1 -i ${srcdir}/fake-progress.patch || return 1
@@ -85,7 +85,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_201104MS4.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_201104MS6.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +