diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index e278cecdb..788c12611 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -176,10 +176,15 @@ extra_files = {
  {"kolibrios/develop/c--/manual_c--.htm", SRC_PROGS .. "/cmm/c--/manual_c--.htm"},
  {"kolibrios/develop/fpc/", "common/develop/fpc/*"},
  {"kolibrios/develop/fpc/examples/", "../programs/develop/fp/examples/src/*"},
- {"kolibrios/develop/oberon07/", "../programs/develop/oberon07/*"},
- {"kolibrios/develop/oberon07/doc/", "../programs/develop/oberon07/doc/*"},
- {"kolibrios/develop/oberon07/lib/KolibriOS/", "../programs/develop/oberon07/lib/KolibriOS/*"},
- {"kolibrios/develop/oberon07/samples/", SRC_PROGS .. "/develop/oberon07/samples/*"},
+ {"kolibrios/develop/oberon07/compiler.kex", SRC_PROGS .. "/develop/oberon07/Compiler.kex"},
+ {"kolibrios/develop/oberon07/LICENSE", SRC_PROGS .. "/develop/oberon07/LICENSE"},
+ {"kolibrios/develop/oberon07/doc/CC.txt", SRC_PROGS .. "/develop/oberon07/doc/CC.txt"},
+ {"kolibrios/develop/oberon07/doc/KOSLib.txt", SRC_PROGS .. "/develop/oberon07/doc/KOSLib.txt"},
+ {"kolibrios/develop/oberon07/doc/x86.txt", SRC_PROGS .. "/develop/oberon07/doc/x86.txt"},
+ {"kolibrios/develop/oberon07/doc/Oberon07.Report_2016_05_03.pdf", SRC_PROGS .. "/develop/oberon07/doc/Oberon07.Report_2016_05_03.pdf"},
+ {"kolibrios/develop/oberon07/lib/KolibriOS/", SRC_PROGS .. "/develop/oberon07/lib/KolibriOS/*"},
+ {"kolibrios/develop/oberon07/lib/Math/", SRC_PROGS .. "/develop/oberon07/lib/Math/*"},
+ {"kolibrios/develop/oberon07/samples/", SRC_PROGS .. "/develop/oberon07/samples/KolibriOS/*"},
  {"kolibrios/develop/tcc/lib/", SRC_PROGS ..  "/develop/ktcc/trunk/bin/lib/*"},
  {"kolibrios/develop/tcc/include/", SRC_PROGS ..  "/develop/ktcc/trunk/libc.obj/include/*"},
  {"kolibrios/develop/tcc/include/clayer/", SRC_PROGS ..  "/develop/ktcc/trunk/libc.obj/include/clayer/*"},
@@ -467,7 +472,6 @@ tup.append_table(img_files, {
  {"DEMOS/ZEROLINE", VAR_PROGS .. "/demos/zeroline/trunk/zeroline"},
  {"DEVELOP/BOARD", VAR_PROGS .. "/system/board/trunk/board"},
  {"DEVELOP/DBGBOARD", VAR_PROGS .. "/system/dbgboard/dbgboard"},
- {"DEVELOP/CEDIT", SRC_PROGS .. "/develop/cedit/CEDIT"},
  {"DEVELOP/CHARSETS", VAR_PROGS .. "/develop/charsets/charsets"},
  {"DEVELOP/COBJ", VAR_PROGS .. "/develop/cObj/trunk/cObj"},
  {"DEVELOP/ENTROPYV", VAR_PROGS .. "/develop/entropyview/entropyview"},
@@ -741,6 +745,13 @@ tup.append_table(extra_files, {
 })
 end -- tup.getconfig('NO_TCC') ~= 'full'
 
+-- Programs that require oberon07 compiler.
+if tup.getconfig('NO_OB07') ~= 'full' then
+tup.append_table(img_files, {
+ {"DEVELOP/CEDIT", VAR_PROGS .. "/develop/cedit/cedit"},
+})
+end -- tup.getconfig('NO_OB07') ~= 'full'
+
 -- Programs that require GCC to compile.
 if tup.getconfig('NO_GCC') ~= 'full' then
 tup.append_table(img_files, {
diff --git a/programs/develop/cedit/CEDIT b/programs/develop/cedit/CEDIT
deleted file mode 100644
index e333c762f..000000000
Binary files a/programs/develop/cedit/CEDIT and /dev/null differ
diff --git a/programs/develop/cedit/Tupfile.lua b/programs/develop/cedit/Tupfile.lua
new file mode 100644
index 000000000..eb4c80257
--- /dev/null
+++ b/programs/develop/cedit/Tupfile.lua
@@ -0,0 +1,11 @@
+if tup.getconfig("NO_OB07") ~= "" then return end
+if tup.getconfig("HELPERDIR") == ""
+then
+  HELPERDIR = "../../"
+end
+
+tup.include(HELPERDIR .. "/use_ob07.lua")
+
+OB07_FLAGS = OB07_FLAGS .. "-nochk a "
+
+build_ob07({"SRC/CEdit.ob07"}, "cedit"); 
diff --git a/programs/use_ob07.lua b/programs/use_ob07.lua
new file mode 100644
index 000000000..c511325a0
--- /dev/null
+++ b/programs/use_ob07.lua
@@ -0,0 +1,6 @@
+OB07 = tup.getcwd() .. "/develop/oberon07/compiler"
+OB07_FLAGS = "-stk 1 "
+
+function build_ob07(input, output)
+  tup.rule(input, OB07 .. " %f kosexe -out %o " .. OB07_FLAGS .. " " .. tup.getconfig("KPACK_CMD"),  output)
+end
diff --git a/tup.config.template b/tup.config.template
index 3e98a790e..8c83afb48 100644
--- a/tup.config.template
+++ b/tup.config.template
@@ -21,6 +21,7 @@
 # CONFIG_NO_MSVC=full
 # CONFIG_NO_CMM=full
 # CONFIG_NO_TCC=full
+# CONFIG_NO_OB07=full
 ### Path to gcc toolchain library with -lgcc.
 ### Normally, you should not modify it,
 ### since the toolchain assumes the fixed path anyway.