diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index f33297172..617fa917b 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -438,7 +438,7 @@ tup.append_table(img_files, {
  {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"},
  {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"},
  {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"},
- {"SETUP", VAR_PROGS .. "/system/setup/trunk/setup"},
+ {"SETUP", VAR_PROGS .. "/system/setup/setup"},
  {"SKINCFG", VAR_PROGS .. "/system/skincfg/trunk/skincfg"},
  {"TERMINAL", VAR_PROGS .. "/system/terminal/terminal"},
  {"TEST", VAR_PROGS .. "/testing/protection/trunk/test"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index bfb9cceae..4074647dc 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -76,7 +76,7 @@ fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev
 fasm system\RB\trunk\@RB.ASM %BIN%\@RB
 fasm system\rdsave\rdsave.asm %BIN%\rdsave
 fasm system\run\run.asm %BIN%\run
-fasm system\setup\trunk\setup.asm %BIN%\setup
+fasm system\setup\setup.asm %BIN%\setup
 fasm system\skinsel\skinsel.asm %BIN%\skinsel
 fasm system\ss\trunk\@ss.asm %BIN%\@ss
 fasm system\vrr\trunk\vrr.asm %BIN%\vrr
diff --git a/programs/system/setup/trunk/Tupfile.lua b/programs/system/setup/Tupfile.lua
similarity index 100%
rename from programs/system/setup/trunk/Tupfile.lua
rename to programs/system/setup/Tupfile.lua
diff --git a/programs/system/setup/trunk/build.bat b/programs/system/setup/build.bat
similarity index 100%
rename from programs/system/setup/trunk/build.bat
rename to programs/system/setup/build.bat
diff --git a/programs/system/setup/trunk/setup.asm b/programs/system/setup/setup.asm
similarity index 98%
rename from programs/system/setup/trunk/setup.asm
rename to programs/system/setup/setup.asm
index d2605475b..f515bab5e 100644
--- a/programs/system/setup/trunk/setup.asm
+++ b/programs/system/setup/setup.asm
@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;;;;;;;;;;;;;;;;;;;;;;;
 ;;  SYSTEM SETTINGS  ;;
 ;;;;;;;;;;;;;;;;;;;;;;;
@@ -15,9 +20,9 @@ dd I_END
 dd param
 dd 0
 
-include '../../../proc32.inc'
-include '../../../macros.inc'
-include '../../../dll.inc'
+include '../../proc32.inc'
+include '../../macros.inc'
+include '../../dll.inc'
 ;---------------------------------------------------------------
 BootSettings:
 ; Set system language
@@ -80,7 +85,7 @@ BootSettings:
 	invoke	ini.get_int, sz_ini, sz_mouse, sz_acceleration, 1
 	mov	edx,eax
 	mcall	18,19,3
-	
+
 ; Set mouse double click delay
 	invoke	ini.get_int, sz_ini, sz_mouse, sz_double_click_delay, 1
 	mov	edx,eax