diff --git a/support-pkg-libcanberra/PKGBUILD b/support-pkg-libcanberra/PKGBUILD
index 68932f5fe..98343e2ae 100644
--- a/support-pkg-libcanberra/PKGBUILD
+++ b/support-pkg-libcanberra/PKGBUILD
@@ -1,15 +1,18 @@
-# $Id: PKGBUILD 13455 2008-09-27 11:03:58Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+#
+# 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>
 
 pkgbase=libcanberra
-pkgname=(libcanberra libcanberra-pulse)
+pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.26
-pkgrel=1
+pkgrel=2
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification without gtk support"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libvorbis>=1.3.1' 'gstreamer0.10>=0.10.30' 'libtool' 'alsa-lib>=1.0.23' 'tdb>=1.2.1')
-makedepends=('libpulse')
+depends=('libvorbis>=1.3.1' 'libtool' 'alsa-lib>=1.0.23' 'tdb>=1.2.1')
+makedepends=('libpulse' 'gstreamer0.10>=0.10.30')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
@@ -35,12 +38,16 @@ package_libcanberra() {
   # Split libcanberra-pulse
   mkdir pulse-plugin
   mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-pulse.* pulse-plugin
+
+  # Split libcanberra-gstreamer
+  mkdir gstreamer-plugin
+  mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-gstreamer.* gstreamer-plugin
 }
 
 package_libcanberra-pulse() {
   pkgdesc="PulseAudio plugin for libcanberra"
   depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-  groups=('pulseaudio')
+  groups=('pulseaudio-gnome')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
@@ -48,3 +55,12 @@ package_libcanberra-pulse() {
   mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
 }
 
+package_libcanberra-gstreamer() {
+  pkgdesc="GStreamer plugin for libcanberra"
+  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10>=0.10.30')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
+  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
+}
\ No newline at end of file
diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 551e5946f..f544e37b6 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -42,6 +42,9 @@ build() {
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_BUILD_TYPE=Release
         make || return 1
-        make DESTDIR=${pkgdir} install || return 1
 }
 
+package() {
+        cd $srcdir/build
+        make DESTDIR=${pkgdir} install || return 1
+}