diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
index 8e56c01..c3e48e5 100644
--- a/recipes-core/base-files/base-files_%.bbappend
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -1,8 +1,6 @@
 BASEFILESISSUEINSTALL =  "do_install_basefilesissue"
 
-distro_version_nodate = "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot').replace('${DATE}','')}"
-
-DISTROVERSION-ISSUE = "${DISTRO_NAME} ${distro_version_nodate} \n"
+DISTROVERSION-ISSUE = "${DISTRO_NAME} ${DISTRO_VERSION} \n"
 DISTROVERSION-ISSUE_append= "kernel \\\r\n"
 DISTROVERSION-ISSUE_append = "\\\n @ \\\l\n"
 
@@ -24,7 +22,5 @@ do_install_basefilesissue() {
 		echo -e "%h\n" >> ${D}${sysconfdir}/issue.net
 }
 
-do_configure[nostamp] = "1"
 do_compile[nostamp] = "1"
 do_install[nostamp] = "1"
-do_install_remove[vardeps] = "DATE DISTRO_VERSION distro_version_nodate DISTROVERSION-ISSUE "