diff --git a/classes/obmc-phosphor-kernel-version.bbclass b/classes/obmc-phosphor-kernel-version.bbclass
new file mode 100644
index 0000000..8fa8947
--- /dev/null
+++ b/classes/obmc-phosphor-kernel-version.bbclass
@@ -0,0 +1,17 @@
+do_kernel_configme_append() {
+    # Remove previous CONFIG_LOCALVERSION
+    sed -i '/CONFIG_LOCALVERSION/d' ${B}/.config
+
+    # Latest version after yocto patched (if any)
+    latestVersion="-$(git rev-parse --verify HEAD)"
+    shortLatestVersion="$(echo ${latestVersion} | cut -c1-8)"
+
+    shortLinuxVersionExt="$(echo ${LINUX_VERSION_EXTENSION} | cut -c1-8)"
+
+    if [ "${latestVersion}" != "${LINUX_VERSION_EXTENSION}" ]; then
+        dirtyString="-dirty"
+        echo "CONFIG_LOCALVERSION="\"${shortLinuxVersionExt}${dirtyString}${shortLatestVersion}\" >> ${B}/.config
+    else
+        echo "CONFIG_LOCALVERSION="\"${shortLinuxVersionExt}\" >> ${B}/.config
+    fi
+}
diff --git a/conf/distro/include/phosphor-base.inc b/conf/distro/include/phosphor-base.inc
index 9cb9f86..b6f1551 100644
--- a/conf/distro/include/phosphor-base.inc
+++ b/conf/distro/include/phosphor-base.inc
@@ -148,3 +148,5 @@
 BAD_RECOMMENDATIONS_pn-obmc-phosphor-image += "shared-mime-info"
 
 LAYER_CONF_VERSION ?= "8"
+
+KERNEL_CLASSES_append = " obmc-phosphor-kernel-version"