diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index eb003fcffd..3696a8cd3b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -358,6 +358,9 @@ sstate_create_package () {
 
 	cd ${SSTATE_BUILDDIR}
 	tar -cvzf ${SSTATE_PKG} *
+
+	cd ${WORKDIR}
+	rm -rf ${SSTATE_BUILDDIR}
 }
 
 #