Index: common/common.sh
==================================================================
--- common/common.sh
+++ common/common.sh
@@ -6,21 +6,21 @@
 archivedir="${pkgdir}/src"
 buildsrcdir="${pkgdir}/buildsrc"
 installdir="${pkgdir}/inst"
 runtimedir="${pkgdir}/out"
 patchdir="${pkgdir}/patches"
-workdir="${pkgdir}/workdir-$$${RANDOM}${RANDOM}${RANDOM}${RANDOM}.work"
+workdir="${pkgdir}/build/workdir-$$${RANDOM}${RANDOM}${RANDOM}${RANDOM}.work"
 
 _download="$(which download)"
 
 function clean() {
 	rm -rf "${installdir}" "${runtimedir}"
 }
 
 function distclean() {
 	rm -rf "${archivedir}"
-	rm -rf "${pkgdir}"/workdir-*
+	rm -rf "${pkgdir}"/build
 }
 
 function init() {
 	clean || return 1
 

Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -40,11 +40,10 @@
 rm -f "kitsh/.success"
 for pkg in ${KITCREATOR_ALLPKGS} ${KITCREATOR_PKGS}; do
 	if [ "${mode}" != "retry" -o ! -f "${pkg}/.success" ]; then
 		rm -f "${pkg}/build.log" "${pkg}/.success"
 		rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"
-		rm -rf "${pkg}"/workdir-*
 
 		rm -rf "${pkg}/src"/tmp-*
 	fi
 
 	if [ "${mode}" = "distclean" ]; then