diff --git a/kdetoys-ktux/PKGBUILD b/kdetoys-ktux/PKGBUILD
new file mode 100644
index 000000000..871ffb097
--- /dev/null
+++ b/kdetoys-ktux/PKGBUILD
@@ -0,0 +1,42 @@
+#
+# KDE SC Packages for Chakra, part of chakra-project.org
+#
+# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+_pkgname="ktux"
+pkgname="kdetoys-ktux"
+arch=('x86_64')
+pkgver=${_kdever}
+pkgrel=1
+pkgdesc="Tux-in-a-Spaceship screen saver"
+conflicts=("kdetoys-common")
+groups=("kde" "kdetoys" "kde-uninstall")
+categories=('accessories')
+install=kdetoys.install
+url="http://www.kde.org"
+license=('GPL' 'LGPL' 'FDL')
+options=('docs' '!splithdr' 'splitdbg' 'log')
+makedepends=('pkg-config' 'cmake' 'automoc4' "kde-workspace>=${_kdever}")
+
+source=($_mirror/${_pkgname}-$_kdever.tar.xz)
+md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  msg "starting build ..."
+  cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
+          -DCMAKE_INSTALL_PREFIX=${_installprefix} \
+          -DCMAKE_SKIP_RPATH=ON \
+          -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
+  make 
+}
+
+package() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install 
+}
+
diff --git a/kdetoys/kdetoys.install b/kdetoys-ktux/kdetoys.install
similarity index 100%
rename from kdetoys/kdetoys.install
rename to kdetoys-ktux/kdetoys.install
diff --git a/kdetoys/PKGBUILD b/kdetoys/PKGBUILD
deleted file mode 100644
index c7c08748f..000000000
--- a/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# KDE SC Packages for Chakra, part of chakra-project.org
-#
-# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-pkgbase=('kdetoys')
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-
-arch=('x86_64')
-pkgver=${_kdever}
-pkgrel=1
-pkgdesc="split package"
-url="http://www.kde.org"
-license=('GPL' 'LGPL' 'FDL')
-
-options=('docs' '!splithdr' 'splitdbg' 'log')
-
-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() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-        # build it
-	msg "starting build ..."
-	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
-
-	make 
-}
-
-package_kdetoys-amor() {
-	pkgdesc="Amusing Misuse Of Resources puts comic figures above your windows"
-	conflicts=("kdetoys-common" "kdetoys-doc")
-	groups=("kde" "kdetoys" "kde-uninstall")
-	categories=('accessories')
-	install=${pkgbase}.install
-
-	cd ${srcdir}/${pkgbase}-${pkgver}/amor
-	make DESTDIR=${pkgdir} install 
-}
-
-package_kdetoys-kteatime() {
-	pkgdesc="System tray applet that makes sure your tea doesn't get too strong"
-	conflicts=("kdetoys-common" "kdetoys-doc")
-	groups=("kde" "kdetoys" "kde-uninstall")
-	categories=('accessories')
-	install=${pkgbase}.install
-
-	cd ${srcdir}/${pkgbase}-${pkgver}/kteatime
-	make DESTDIR=${pkgdir} install 
-}
-
-package_kdetoys-ktux() {
-	pkgdesc="Tux-in-a-Spaceship screen saver"
-	conflicts=("kdetoys-common")
-	groups=("kde" "kdetoys" "kde-uninstall")
-	categories=('accessories')
-	install=${pkgbase}.install
-
-	cd ${srcdir}/${pkgbase}-${pkgver}/ktux
-	make DESTDIR=${pkgdir} install 
-}
-