diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
new file mode 100644
index 000000000..d072223da
--- /dev/null
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -0,0 +1,37 @@
+#
+# 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>
+# (c) 2010 Drake Justice
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=cinstall
+pkgver=0.3.0
+pkgrel=1
+depends=('squashfs-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse')
+makedeps=('kdelibs' 'qt')
+pkgdesc="Bundle Creator/Launcher and Package-Manager"
+arch=("i686" "x86_64")
+license=('GPL')
+install=$pkgname.install
+url="http://chakra-project.org/"
+optdepends=('akabei: for akabei support'
+            'pacman: for pacman support')
+
+source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.gz")
+md5sums=('4f06339cc3e329d69d28ab3b93353510')
+
+build() {
+        mkdir -p $srcdir/build
+        cd $srcdir/build
+
+        cmake ../cinstall-cinstall \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_BUILD_TYPE=Release
+        make || return 1
+        make DESTDIR=${pkgdir} install || return 1
+}
+
diff --git a/tools-pkg-cinstall/cinstall.install b/tools-pkg-cinstall/cinstall.install
new file mode 100644
index 000000000..5dd7eb35a
--- /dev/null
+++ b/tools-pkg-cinstall/cinstall.install
@@ -0,0 +1,145 @@
+post_install() {
+		if [ -e "/etc/chakra/updates.conf" ] ; then
+
+			. /etc/chakra/updates.conf
+
+			if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
+				/usr/bin/chakra-update-icons
+			fi
+
+		else
+			echo " > WARNING"
+			echo "   The package kde-common seems not to be installed,"
+			echo "   this can possibly break the installation. Just install it"
+			echo "   manually after this installation/update, run the following"
+			echo "   commands and restart KDE afterwards:"
+			echo "   sudo chakra-config-updater"
+			echo "   kbuildsycoca4"
+			echo " "
+		fi
+
+		echo "Create group bundle"
+
+		if [ "Group: `grep bundle /etc/group`" = "Group: " ] ; then
+			groupadd bundle
+		else
+			echo "Group bundle already exists"
+		fi
+
+		echo "Adding all existing users to group bundle"
+
+		for i in `cat /etc/passwd | grep /home | cut -d: -f1` ;  do
+			echo " - adding user $i"
+			usermod -a -G bundle $i
+		done
+
+		echo "Configuring sudoers file"
+		if [ "`grep '/bin/mount -o loop -t squashfs' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t squashfs *" >> /etc/sudoers
+		elif [ "`grep '/bin/mount -o loop -t ext4' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t ext4 *" >> /etc/sudoers
+		elif [ "`grep '/bin/umount *' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/umount *" >> /etc/sudoers
+		elif [ "`grep '/bin/chmod a+w *' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/chmod a+w *" >> /etc/sudoers
+		else
+			echo "sudoers file already modded"
+		fi
+
+		chmod -v 0440 /etc/sudoers
+
+		mkdir -p /etc/cb.conf.d &>/dev/null
+		chmod 775 /etc/cb.conf.d &>/dev/null
+		chown -R root:bundle /etc/cb.conf.d &>/dev/null
+
+		echo "update mime-database"      
+		update-mime-database /usr/share/mime &>/dev/null
+}
+
+post_upgrade() {
+		if [ -e "/etc/chakra/updates.conf" ] ; then
+
+			. /etc/chakra/updates.conf
+
+			if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
+				/usr/bin/chakra-update-icons
+			fi
+
+		else
+			echo " > WARNING"
+			echo "   The package kde-common seems not to be installed,"
+			echo "   this can possibly break the installation. Just install it"
+			echo "   manually after this installation/update, run the following"
+			echo "   commands and restart KDE afterwards:"
+			echo "   sudo chakra-config-updater"
+			echo "   kbuildsycoca4"
+			echo " "
+		fi
+
+		echo "Create group bundle"
+
+		if [ "Group: `grep bundle /etc/group`" = "Group: " ] ; then
+			groupadd bundle
+		else
+			echo "Group bundle already exists"
+		fi
+
+		echo "Adding all existing users to group bundle"
+
+		for i in `cat /etc/passwd | grep /home | cut -d: -f1` ;  do
+			echo " - adding user $i"
+			usermod -a -G bundle $i
+		done
+
+		echo "Configuring sudoers file"
+		if [ "`grep '/bin/mount -o loop -t squashfs' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t squashfs *" >> /etc/sudoers
+		elif [ "`grep '/bin/mount -o loop -t ext4' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t ext4 *" >> /etc/sudoers
+		elif [ "`grep '/bin/umount *' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/umount *" >> /etc/sudoers
+		elif [ "`grep '/bin/chmod a+w *' /etc/sudoers`" = "" ] ; then
+			echo "%bundle ALL=NOPASSWD: /bin/chmod a+w *" >> /etc/sudoers
+		else
+			echo "sudoers file already modded"
+		fi
+
+		chmod -v 0440 /etc/sudoers
+
+		mkdir -p /etc/cb.conf.d &>/dev/null
+		chmod 775 /etc/cb.conf.d &>/dev/null
+		chown -R root:bundle /etc/cb.conf.d &>/dev/null
+		rm /etc/cb.conf.d/* -rv
+
+		echo "update mime-database"      
+		update-mime-database /usr/share/mime &>/dev/null
+}
+
+post_remove() {
+		if [ -e "/etc/chakra/updates.conf" ] ; then
+
+			. /etc/chakra/updates.conf
+
+			if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
+				/usr/bin/chakra-update-icons
+			fi
+
+		else
+			echo " > WARNING"
+			echo "   The package kde-common seems not to be installed,"
+			echo "   this can possibly break the installation. Just install it"
+			echo "   manually after this installation/update, run the following"
+			echo "   commands and restart KDE afterwards:"
+			echo "   sudo chakra-config-updater"
+			echo "   kbuildsycoca4"
+			echo " "
+		fi
+
+                rm /etc/cb.conf.d -r
+
+}
+
+op=$1
+shift
+
+$op $*