diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 670ddbf80c..786429903b 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -174,6 +174,8 @@ extra_files = {
  {"kolibrios/develop/oberon07/Lib/KolibriOS/", PROGS .. "/develop/oberon07/Lib/KolibriOS/*"},
  {"kolibrios/develop/oberon07/Samples/", PROGS .. "/develop/oberon07/Samples/*"},
  {"kolibrios/develop/TinyBasic/", "common/develop/TinyBasic/*"},
+ {"kolibrios/CNC/cnc_editor", PROGS .. "/other/cnc_editor/cnc_editor"},
+ {"kolibrios/CNC/kolibri.nc", PROGS .. "/other/cnc_editor/kolibri.nc"},
  {"kolibrios/emul/dosbox/", "common/emul/DosBox/*"},
  {"kolibrios/emul/e80/readme.txt", PROGS .. "/emulator/e80/trunk/readme.txt"},
  {"kolibrios/emul/fceu/fceu", PROGS .. "/emulator/fceu/fceu"},
diff --git a/programs/other/cnc_editor/Tupfile.lua b/programs/other/cnc_editor/Tupfile.lua
new file mode 100644
index 0000000000..677d749f79
--- /dev/null
+++ b/programs/other/cnc_editor/Tupfile.lua
@@ -0,0 +1,3 @@
+if tup.getconfig("NO_FASM") ~= "" then return end
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
+tup.rule({"cnc_editor.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "cnc_editor")