diff --git a/applets/Kbuild b/applets/Kbuild
index b9dba03..ef4b76f 100644
--- a/applets/Kbuild
+++ b/applets/Kbuild
@@ -14,20 +14,20 @@
 
 # Generated files need additional love
 
-quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
-      cmd_gen_usage_compressed = $(srctree)/applets/usage_compressed include/usage_compressed.h applets
-
 HOSTCFLAGS_usage.o = -I$(srctree)/include
 
-applets/applets.o:          include/usage_compressed.h include/applet_tables.h
+applets/applets.o: include/usage_compressed.h include/applet_tables.h
 
-applets/usage:              .config $(srctree)/applets/usage_compressed
+applets/usage:     .config $(srctree)/applets/usage_compressed
+
+quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
+      cmd_gen_usage_compressed = $(srctree)/applets/usage_compressed include/usage_compressed.h applets
 
 include/usage_compressed.h: applets/usage $(srctree)/applets/usage_compressed
 	$(call cmd,gen_usage_compressed)
 
-# Two-stage file creation, to avoid having target file still created
-# in case applet_tables fails
+quiet_cmd_gen_applet_tables = GEN     include/applet_tables.h
+      cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h
+
 include/applet_tables.h: applets/applet_tables
-	applets/applet_tables >include/applet_tables.h.tmp
-	mv include/applet_tables.h.tmp include/applet_tables.h
+	$(call cmd,gen_applet_tables)