diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 788c12611..b5dce6c1c 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -25,7 +25,6 @@ img_files = {
  {"MACROS.INC", SRC_PROGS .. "/macros.inc"},
 -- {"CONFIG.INC", SRC_PROGS .. "/config.inc"},
  {"STRUCT.INC", SRC_PROGS .. "/struct.inc"},
- {"FB2READ", "common/fb2read"},
  {"ALLGAMES", "common/allgames"},
  {"HOME.PNG", "common/wallpapers/T_Home.png"},
  {"ICONS32.PNG", "common/icons32.png"},
@@ -749,6 +748,7 @@ end -- tup.getconfig('NO_TCC') ~= 'full'
 if tup.getconfig('NO_OB07') ~= 'full' then
 tup.append_table(img_files, {
  {"DEVELOP/CEDIT", VAR_PROGS .. "/develop/cedit/cedit"},
+ {"FB2READ", VAR_PROGS .. "/other/fb2reader/fb2read"},
 })
 end -- tup.getconfig('NO_OB07') ~= 'full'
 
diff --git a/data/common/fb2read b/data/common/fb2read
deleted file mode 100644
index d2bcf08c2..000000000
Binary files a/data/common/fb2read and /dev/null differ
diff --git a/programs/other/fb2reader/SRC/Libimg.ob07 b/programs/other/fb2reader/SRC/LibImg.ob07
similarity index 100%
rename from programs/other/fb2reader/SRC/Libimg.ob07
rename to programs/other/fb2reader/SRC/LibImg.ob07
diff --git a/programs/other/fb2reader/Tupfile.lua b/programs/other/fb2reader/Tupfile.lua
new file mode 100644
index 000000000..1755d13f5
--- /dev/null
+++ b/programs/other/fb2reader/Tupfile.lua
@@ -0,0 +1,9 @@
+if tup.getconfig("NO_OB07") ~= "" then return end
+if tup.getconfig("HELPERDIR") == ""
+then
+  HELPERDIR = "../../"
+end
+
+tup.include(HELPERDIR .. "/use_ob07.lua")
+
+build_ob07({"SRC/FB2READ.ob07"}, "fb2read", "-upper");
diff --git a/programs/use_ob07.lua b/programs/use_ob07.lua
index f8f80834b..06701f1a3 100644
--- a/programs/use_ob07.lua
+++ b/programs/use_ob07.lua
@@ -1,6 +1,7 @@
-OB07 = tup.getcwd() .. "/develop/oberon07/compiler"
-OB07_FLAGS = "-stk 1 -nochk a"
-
-function build_ob07(input, output)
-  tup.rule(input, OB07 .. " %f kosexe -out %o " .. OB07_FLAGS .. " " .. tup.getconfig("KPACK_CMD"),  output)
-end
+OB07 = tup.getcwd() .. "/develop/oberon07/compiler"
+OB07_FLAGS = "-stk 1 -nochk a"
+
+function build_ob07(input, output, extra_flags)
+  extra_flags = extra_flags or ""
+  tup.rule(input, OB07 .. " %f kosexe -out %o " .. OB07_FLAGS .. " " .. extra_flags .. " " .. tup.getconfig("KPACK_CMD"),  output)
+end