diff --git a/meta/packages/mtools/mtools-native_3.9.9.bb b/meta/packages/mtools/mtools-native_3.9.9.bb
deleted file mode 100644
index c82f7404eb..0000000000
--- a/meta/packages/mtools/mtools-native_3.9.9.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# mtools-native OE build file
-# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require mtools_${PV}.bb
-
-inherit autotools native
diff --git a/meta/packages/mtools/files/mtools-makeinfo.patch b/meta/packages/mtools/mtools/mtools-makeinfo.patch
similarity index 100%
rename from meta/packages/mtools/files/mtools-makeinfo.patch
rename to meta/packages/mtools/mtools/mtools-makeinfo.patch
diff --git a/meta/packages/mtools/files/mtools.patch b/meta/packages/mtools/mtools/mtools.patch
similarity index 100%
rename from meta/packages/mtools/files/mtools.patch
rename to meta/packages/mtools/mtools/mtools.patch
diff --git a/meta/packages/mtools/files/no-x11.patch b/meta/packages/mtools/mtools/no-x11.patch
similarity index 100%
rename from meta/packages/mtools/files/no-x11.patch
rename to meta/packages/mtools/mtools/no-x11.patch
diff --git a/meta/packages/mtools/mtools_3.9.9.bb b/meta/packages/mtools/mtools_3.9.9.bb
index 974ba956b9..932d88f2a3 100644
--- a/meta/packages/mtools/mtools_3.9.9.bb
+++ b/meta/packages/mtools/mtools_3.9.9.bb
@@ -18,3 +18,5 @@ S = "${WORKDIR}/mtools-${PV}"
 inherit autotools
 
 EXTRA_OECONF = "--without-x"
+
+BBCLASSEXTEND = "native"