diff --git a/recipes/yaffs2/yaffs2-utils.inc b/recipes/yaffs2/yaffs2-utils.inc
deleted file mode 100644
index e2f3d76f65..0000000000
--- a/recipes/yaffs2/yaffs2-utils.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Tools for managing 'yaffs2' file systems."
-SECTION = "base"
-HOMEPAGE = "http://www.yaffs.net"
-LICENSE = "GPLv2"
-PV = "0.0.0+cvs${SRCDATE}"
-PR = "r2"
-DEPENDS = "mtd-utils"
-
-SRC_URI = "cvs://anonymous@cvs.aleph1.co.uk/home/aleph1/cvs;module=yaffs2 \
-           file://mkyaffs2image.patch \
-	   file://devextras.h.patch"
-
-S = "${WORKDIR}/yaffs2"
-
-CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL "
-CFLAGS_append_virtclass-native = " -I.. -DCONFIG_YAFFS_UTIL "
-
-do_compile() {
-	cd utils && oe_runmake
-}
-
-NATIVE_INSTALL_WORKS = "1"
-do_install() {
-	install -d ${D}${sbindir}/
-	for i in mkyaffsimage mkyaffs2image; do
-		install -m 0755 utils/$i ${D}${sbindir}/
-	done
-}
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/yaffs2/yaffs2-utils_cvs.bb b/recipes/yaffs2/yaffs2-utils_cvs.bb
index ee95a5e42f..e2f3d76f65 100644
--- a/recipes/yaffs2/yaffs2-utils_cvs.bb
+++ b/recipes/yaffs2/yaffs2-utils_cvs.bb
@@ -1,2 +1,30 @@
-require yaffs2-utils.inc
+DESCRIPTION = "Tools for managing 'yaffs2' file systems."
+SECTION = "base"
+HOMEPAGE = "http://www.yaffs.net"
+LICENSE = "GPLv2"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r2"
+DEPENDS = "mtd-utils"
 
+SRC_URI = "cvs://anonymous@cvs.aleph1.co.uk/home/aleph1/cvs;module=yaffs2 \
+           file://mkyaffs2image.patch \
+	   file://devextras.h.patch"
+
+S = "${WORKDIR}/yaffs2"
+
+CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL "
+CFLAGS_append_virtclass-native = " -I.. -DCONFIG_YAFFS_UTIL "
+
+do_compile() {
+	cd utils && oe_runmake
+}
+
+NATIVE_INSTALL_WORKS = "1"
+do_install() {
+	install -d ${D}${sbindir}/
+	for i in mkyaffsimage mkyaffs2image; do
+		install -m 0755 utils/$i ${D}${sbindir}/
+	done
+}
+
+BBCLASSEXTEND = "native"