diff --git a/grantlee/PKGBUILD b/grantlee/PKGBUILD
new file mode 100644
index 000000000..2afff7ebb
--- /dev/null
+++ b/grantlee/PKGBUILD
@@ -0,0 +1,28 @@
+# Support packages for Desktop
+
+pkgname=grantlee
+pkgver=0.3.0
+pkgrel=1
+pkgdesc="A string template engine based on the Django template system and written in Qt"
+arch=('x86_64')
+url="http://www.gitorious.org/grantlee/pages/Home"
+license=('LGPL3')
+depends=('qt')
+makedepends=('cmake' 'doxygen')
+conflicts=('grantlee-git')
+source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
+md5sums=('195763a3238f51f8885881fc8012cd83')
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/kdelibs/PKGBUILD b/kdelibs/PKGBUILD
index 6af3a1da4..ae8ba3b32 100644
--- a/kdelibs/PKGBUILD
+++ b/kdelibs/PKGBUILD
@@ -22,7 +22,7 @@ depends=("${_qtpkg}>=${_qtver}" "kde-common>=${_kdever}" "oxygen-icons>=${_kdeve
 	    'shared-mime-info' 'upower' 'udisks' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib'
 	    'strigi' 'libxtst' 'soprano>=2.7.56' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt>=0.98.1'
 	    'libxss' 'phonon' 'shared-desktop-ontologies>=0.7' 'attica>=0.2.0' 'krb5' 'libxcursor' 
-	    'hicolor-icon-theme' 'libdbusmenu-qt' 'grantlee-git' 'media-player-info' 'qtwebkit' 'systemd')
+	    'hicolor-icon-theme' 'libdbusmenu-qt' 'grantlee>=0.3.0.' 'media-player-info' 'qtwebkit' 'systemd')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'shared-mime-info' 
              'docbook-xsl' 'docbook-xml' 'bzip2>=1.0.6' 'libzip')
 optdepends=('phonon-gstreamer: GStreamer Phonon backend (default)'
diff --git a/kdepim/PKGBUILD b/kdepim/PKGBUILD
index efdd8c3dd..076b48a78 100644
--- a/kdepim/PKGBUILD
+++ b/kdepim/PKGBUILD
@@ -7,9 +7,6 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-#
-# package info
-#
 pkgbase="kdepim"
 pkgname=('kdepim-common'
 	 'kdepim-akonadiconsole'
@@ -27,7 +24,7 @@ pkgname=('kdepim-common'
          'kdepim-ktimetracker'
          'kdepim-mobile')
    
-arch=('i686' 'x86_64')
+arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
 pkgdesc="split package"
@@ -37,14 +34,13 @@ options=('!docs' '!splithdr' 'splitdbg' 'log')
 
 makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' "kdelibs>=${_kdever}" "kdepimlibs>=${_kdever}"
              "kdepim-runtime>=${_kdever}" 'libxss' "kde-runtime" "libsamplerate" "qrencode" "libdmtx"
-	     'kde-agent' 'libindicate-qt>=0.2.2' 'docbook-xml' 'dblatex')
+	     "kde-common>=${_kdever}" 'libindicate-qt>=0.2.2' 'docbook-xml' 'dblatex' "nepomuk-widgets>=${_kdever}")
 
 
 source=($_mirror/${pkgbase}-${pkgver}.tar.xz)
 md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
 
 build() {
-
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -55,9 +51,6 @@ build() {
 	make || return 1
 }
 
-#
-# split-install functions
-#
 package_kdepim-common() {
 	pkgdesc="KDE PIM - Common files and libraries"
 	depends=("kdepimlibs>=${_kdever}" 'libxss' "kde-runtime" 'kde-agent'
diff --git a/kdetoys/PKGBUILD b/kdetoys/PKGBUILD
index 19bae2e98..3a7cb576d 100644
--- a/kdetoys/PKGBUILD
+++ b/kdetoys/PKGBUILD
@@ -1,15 +1,11 @@
 #
 # KDE SC 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>
+# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-#
-# package info
-#
 pkgbase=('kdetoys')
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
@@ -29,10 +25,6 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kde-workspace>=${_kdever}")
 source=($_mirror/${pkgbase}-$_kdever.tar.xz)
 md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
 
-
-#
-# build function
-#
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
@@ -46,9 +38,6 @@ build() {
 	make || return 1
 }
 
-#
-# split-install functions
-#
 package_kdetoys-amor() {
 	pkgdesc="Amusing Misuse Of Resources puts comic figures above your windows"
 	conflicts=("kdetoys-common" "kdetoys-doc")