diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 8514e037b..fe5aaa5f5 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -725,7 +725,7 @@ tup.append_table(img_files, {
 })
 tup.append_table(extra_files, {
  {"kolibrios/utils/thashview", VAR_PROGS .. "/other/TinyHashView/thashview"},
- {"kolibrios/demos/kmatrix", VAR_PROGS .. "/demos/kmatrix/trunk/kmatrix"},
+ {"kolibrios/demos/kmatrix", VAR_PROGS .. "/demos/kmatrix/kmatrix"},
  {"kolibrios/utils/graph", VAR_PROGS .. "/other/graph/branches/tcc_current/graph"},
  {"kolibrios/develop/TinyBasic/TinyBasic", VAR_PROGS .. "/develop/tinybasic-1.0.4/tinybasic"},
  {"kolibrios/develop/TinyBasic/bas/", SRC_PROGS .. "/develop/tinybasic-1.0.4/bas/*"},
diff --git a/programs/demos/kmatrix/trunk/COPYING b/programs/demos/kmatrix/COPYING
similarity index 100%
rename from programs/demos/kmatrix/trunk/COPYING
rename to programs/demos/kmatrix/COPYING
diff --git a/programs/demos/kmatrix/trunk/Tupfile.lua b/programs/demos/kmatrix/Tupfile.lua
similarity index 57%
rename from programs/demos/kmatrix/trunk/Tupfile.lua
rename to programs/demos/kmatrix/Tupfile.lua
index 7520315ee..025efea41 100755
--- a/programs/demos/kmatrix/trunk/Tupfile.lua
+++ b/programs/demos/kmatrix/Tupfile.lua
@@ -1,6 +1,6 @@
 if tup.getconfig("NO_TCC") ~= "" then return end
 
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_tcc.lua")
 
 link_tcc("main.c", "kmatrix");
diff --git a/programs/demos/kmatrix/trunk/build_kolibrios.sh b/programs/demos/kmatrix/build_kolibrios.sh
similarity index 100%
rename from programs/demos/kmatrix/trunk/build_kolibrios.sh
rename to programs/demos/kmatrix/build_kolibrios.sh
diff --git a/programs/demos/kmatrix/trunk/main.c b/programs/demos/kmatrix/main.c
similarity index 100%
rename from programs/demos/kmatrix/trunk/main.c
rename to programs/demos/kmatrix/main.c