diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 358b501e57..26c59abf8e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -406,10 +406,13 @@ def check_gcc3(data):
 	
 	return False
 
-addtask cleanall after do_clean
-python do_cleanall() {
+addtask cleansstate after do_clean
+python do_cleansstate() {
         sstate_clean_cachefiles(d)
+}
 
+addtask cleanall after do_cleansstate
+python do_cleanall() {
         src_uri = (bb.data.getVar('SRC_URI', d, True) or "").split()
         if len(src_uri) == 0:
             return