diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 258d3345e8..13940f81db 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -301,7 +301,7 @@ def check_sanity(e):
             f.write(current_abi)
         elif (abi != current_abi):
             # Code to convert from one ABI to another could go here if possible.
-            messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
+            messages = messages + "Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
     else:
         f = file(abifile, "w")
         f.write(current_abi)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index dbe0e46b54..c2dc22e0ac 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -1,4 +1,4 @@
-SSTATE_VERSION = "1"
+SSTATE_VERSION = "2"
 
 SSTATE_MANIFESTS = "${TMPDIR}/sstate-control"
 SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index 3920766a47..f2919e5b60 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
 # that breaks the format and have been previously discussed on the mailing list 
 # with general agreement from the core team.
 #
-OELAYOUT_ABI = "6"
+OELAYOUT_ABI = "7"