diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index e34467b1d..ff9a899f1 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -446,7 +446,7 @@ tup.append_table(img_files, {
  {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"},
  {"TIMER", VAR_PROGS .. "/other/Timer/Timer"},
  {"UNZ", VAR_PROGS .. "/fs/unz/unz"},
- {"ZKEY", VAR_PROGS .. "/system/zkey/trunk/ZKEY"},
+ {"ZKEY", VAR_PROGS .. "/system/zkey/ZKEY"},
  {"3D/3DWAV", VAR_PROGS .. "/demos/3dwav/trunk/3dwav"},
  {"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/trunk/crownscr"},
  {"3D/3DCUBE2", VAR_PROGS .. "/demos/3dcube2/trunk/3DCUBE2"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 2424c5672..3efe76539 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -81,7 +81,7 @@ fasm system\skinsel\skinsel.asm %BIN%\skinsel
 fasm system\ss\trunk\@ss.asm %BIN%\@ss
 fasm system\vrr\trunk\vrr.asm %BIN%\vrr
 fasm system\vrr_m\trunk\vrr_m.asm %BIN%\vrr_m
-fasm system\zkey\trunk\zkey.asm %BIN%\zkey
+fasm system\zkey\zkey.asm %BIN%\zkey
 
 echo *
 echo Building develop
diff --git a/programs/system/zkey/trunk/ASPAPI.INC b/programs/system/zkey/ASPAPI.INC
similarity index 98%
rename from programs/system/zkey/trunk/ASPAPI.INC
rename to programs/system/zkey/ASPAPI.INC
index 52d10df41..a89aa885b 100644
--- a/programs/system/zkey/trunk/ASPAPI.INC
+++ b/programs/system/zkey/ASPAPI.INC
@@ -1,4 +1,4 @@
-include '../../../proc32.inc'
+include '../../proc32.inc'
 
 macro start_draw_window x,y,xsize,ysize,areacolor,caption
 {
@@ -125,4 +125,3 @@ macro putpixel x,y,color
   mov edx, color
   int 0x40
 }
-
diff --git a/programs/system/zkey/trunk/Tupfile.lua b/programs/system/zkey/Tupfile.lua
similarity index 100%
rename from programs/system/zkey/trunk/Tupfile.lua
rename to programs/system/zkey/Tupfile.lua
diff --git a/programs/system/zkey/trunk/ZKEY.ASM b/programs/system/zkey/ZKEY.ASM
similarity index 99%
rename from programs/system/zkey/trunk/ZKEY.ASM
rename to programs/system/zkey/ZKEY.ASM
index 4599fd79f..57d6880cd 100644
--- a/programs/system/zkey/trunk/ZKEY.ASM
+++ b/programs/system/zkey/ZKEY.ASM
@@ -1,4 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
 ;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;   ZKEY. Version 0.51.
 ;   Virtual keyboard for KolibriOS.
 ;
@@ -20,7 +25,7 @@ use32
         dd     0
         dd     0
 
-include '../../../macros.inc'
+include '../../macros.inc'
 include "ASPAPI.INC"
 
 N_KEYCOLOR equ 0x00677889 ; Normal button color
@@ -168,19 +173,19 @@ draw_window:
   mul   byte [keyboard_mode]
   add   eax, SwitchText
   stdcall draw_button, 513,28,46,20,106,0x00700000,eax,6,TEXTCOLOR       ; Scan/ASCII switch
-  
+
   xor   al, al
   xchg  al, [red_type]
   test  al, 2
   jnz   .skip_end_draw_window ; if we draw switch button without redraw window then end_draw_window not need
-  
+
 @@:
  .draw_indicators_area:
   call lights_on
 
   end_draw_window
-  
-.skip_end_draw_window:  
+
+.skip_end_draw_window:
 ret
 
 get_zkey_window_slot_number:
@@ -197,14 +202,14 @@ still:
         call    get_receiver_window_slot_number
         call    get_receiver_window_keyboard_mode ; return in ecx keyboard_mode for set_keyboard_mode
         call    set_keyboard_mode
-; delete_switch_button 
-        mov eax, 8 
+; delete_switch_button
+        mov eax, 8
         mov edx, BT_DEL + 0x00700000
-        int     0x40 
+        int     0x40
 
         mov    byte [red_type], 2
         call    draw_window.draw_switch_button
- 
+
         mov     eax, 10               ; Wait for an event in the queue.
         int     0x40
 
@@ -486,4 +491,3 @@ PROCINFO_BUFF process_information
         rb 4096
 STACKTOP:
 MEM:
-
diff --git a/programs/system/zkey/trunk/makefile b/programs/system/zkey/makefile
similarity index 100%
rename from programs/system/zkey/trunk/makefile
rename to programs/system/zkey/makefile