diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index b84c912db..e33179d98 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -400,7 +400,7 @@ tup.append_table(img_files, {
  {"@DOCKY", VAR_PROGS .. "/system/docky/docky"},
  {"@HA", VAR_PROGS .. "/other/ha/HA"},
  {"@ICON", VAR_PROGS .. "/system/icon_new/icon"},
- {"@MENU", VAR_PROGS .. "/system/menu/trunk/menu"},
+ {"@MENU", VAR_PROGS .. "/system/menu/menu"},
  {"@NOTIFY", VAR_PROGS .. "/system/notify3/notify"},
  {"@OPEN", VAR_PROGS .. "/system/open/open"},
  {"@TASKBAR", VAR_PROGS .. "/system/taskbar/trunk/TASKBAR"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index c37d115f4..98f6890ef 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -68,7 +68,7 @@ fasm system\gmon\gmon.asm %BIN%\gmon
 fasm system\icon\icon.asm %BIN%\icon
 fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
 fasm system\launcher\launcher.asm %BIN%\launcher
-fasm system\menu\trunk\menu.asm %BIN%\@menu
+fasm system\menu\menu.asm %BIN%\@menu
 fasm system\mgb\trunk\mgb.asm %BIN%\mgb
 fasm system\mousemul\trunk\mousemul.asm %BIN%\mousemul
 fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR
diff --git a/programs/system/menu/trunk/Tupfile.lua b/programs/system/menu/Tupfile.lua
similarity index 79%
rename from programs/system/menu/trunk/Tupfile.lua
rename to programs/system/menu/Tupfile.lua
index 78d2f230c..33b6024fc 100644
--- a/programs/system/menu/trunk/Tupfile.lua
+++ b/programs/system/menu/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" 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_fasm.lua")
 add_include(tup.getvariantdir())
 
diff --git a/programs/system/menu/trunk/build.bat b/programs/system/menu/build.bat
similarity index 100%
rename from programs/system/menu/trunk/build.bat
rename to programs/system/menu/build.bat
diff --git a/programs/system/menu/trunk/build.sh b/programs/system/menu/build.sh
similarity index 100%
rename from programs/system/menu/trunk/build.sh
rename to programs/system/menu/build.sh
diff --git a/programs/system/menu/trunk/makefile b/programs/system/menu/makefile
similarity index 100%
rename from programs/system/menu/trunk/makefile
rename to programs/system/menu/makefile
diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/menu.asm
similarity index 99%
rename from programs/system/menu/trunk/menu.asm
rename to programs/system/menu/menu.asm
index 82e879931..3189eb0b2 100644
--- a/programs/system/menu/trunk/menu.asm
+++ b/programs/system/menu/menu.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;******************************************************************************
 ;   MAIN MENU
 ;******************************************************************************
@@ -41,11 +44,11 @@
 	dd bootparam   ; boot parameters
 	dd 0x0         ; path
 ;------------------------------------------------------------------------------
-include "..\..\..\macros.inc"
-include "..\..\..\struct.inc"
-include "..\..\..\gui_patterns.inc"
+include "..\..\macros.inc"
+include "..\..\struct.inc"
+include "..\..\gui_patterns.inc"
 ; Formatted debug output:
-include "..\..\..\debug-fdo.inc"
+include "..\..\debug-fdo.inc"
 __DEBUG__       = 1             ; 0 - disable debug output / 1 - enable debug output
 __DEBUG_LEVEL__ = DBG_ERR      ; set the debug level
 DBG_ALL       = 0  ; all messages
diff --git a/programs/system/menu/trunk/readme.txt b/programs/system/menu/readme.txt
similarity index 100%
rename from programs/system/menu/trunk/readme.txt
rename to programs/system/menu/readme.txt