diff --git a/meta/packages/zaurus-updater/encdec-updater-native.bb b/meta/packages/zaurus-updater/encdec-updater-native.bb
deleted file mode 100644
index 3bf49d5010..0000000000
--- a/meta/packages/zaurus-updater/encdec-updater-native.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require encdec-updater.bb
-inherit native
-
-do_stage() {
-	install -m 0755 encdec-updater ${STAGING_BINDIR}
-}
diff --git a/meta/packages/zaurus-updater/encdec-updater.bb b/meta/packages/zaurus-updater/encdec-updater.bb
index c03e9b4454..c59d0e2976 100644
--- a/meta/packages/zaurus-updater/encdec-updater.bb
+++ b/meta/packages/zaurus-updater/encdec-updater.bb
@@ -14,3 +14,5 @@ do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 encdec-updater ${D}${bindir}/
 }
+
+BBCLASSEXTEND = "native"
\ No newline at end of file
diff --git a/meta/packages/zaurus-updater/files/encdec-updater.c b/meta/packages/zaurus-updater/encdec-updater/encdec-updater.c
similarity index 100%
rename from meta/packages/zaurus-updater/files/encdec-updater.c
rename to meta/packages/zaurus-updater/encdec-updater/encdec-updater.c
diff --git a/meta/packages/zaurus-updater/files/gnu-tar.gz b/meta/packages/zaurus-updater/zaurus-updater/gnu-tar.gz
similarity index 100%
rename from meta/packages/zaurus-updater/files/gnu-tar.gz
rename to meta/packages/zaurus-updater/zaurus-updater/gnu-tar.gz