diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 103a13299..d8a643f52 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -448,7 +448,7 @@ tup.append_table(img_files, {
  {"UNZ", VAR_PROGS .. "/fs/unz/unz"},
  {"ZKEY", VAR_PROGS .. "/system/zkey/trunk/ZKEY"},
  {"3D/3DWAV", VAR_PROGS .. "/demos/3dwav/3dwav"},
- {"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/trunk/crownscr"},
+ {"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/crownscr"},
  {"3D/3DCUBE2", VAR_PROGS .. "/demos/3dcube2/3DCUBE2"},
  {"3D/FREE3D04", VAR_PROGS .. "/demos/free3d04/trunk/free3d04"},
  {"3D/GEARS", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/gears"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 8cae84dbb..87d400663 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -210,7 +210,7 @@ cd ..\..\..
 fasm demos\bcdclk\bcdclk.asm %BIN%\demos\bcdclk
 fasm demos\bgitest\trunk\bgitest.asm %BIN%\fonts\bgitest
 fasm demos\colorref\colorref.asm %BIN%\demos\colorref
-fasm demos\crownscr\trunk\crownscr.asm %BIN%\3d\crownscr
+fasm demos\crownscr\crownscr.asm %BIN%\3d\crownscr
 fasm demos\cslide\trunk\cslide.asm %BIN%\demos\cslide
 fasm demos\eyes\trunk\eyes.asm %BIN%\demos\eyes
 fasm demos\fire\trunk\fire.asm %BIN%\demos\fire
diff --git a/programs/demos/crownscr/trunk/Tupfile.lua b/programs/demos/crownscr/Tupfile.lua
similarity index 100%
rename from programs/demos/crownscr/trunk/Tupfile.lua
rename to programs/demos/crownscr/Tupfile.lua
diff --git a/programs/demos/crownscr/trunk/build_en.bat b/programs/demos/crownscr/build_en.bat
similarity index 100%
rename from programs/demos/crownscr/trunk/build_en.bat
rename to programs/demos/crownscr/build_en.bat
diff --git a/programs/demos/crownscr/trunk/build_ru.bat b/programs/demos/crownscr/build_ru.bat
similarity index 100%
rename from programs/demos/crownscr/trunk/build_ru.bat
rename to programs/demos/crownscr/build_ru.bat
diff --git a/programs/demos/crownscr/trunk/crownscr.asm b/programs/demos/crownscr/crownscr.asm
similarity index 98%
rename from programs/demos/crownscr/trunk/crownscr.asm
rename to programs/demos/crownscr/crownscr.asm
index 870da1ecc..f69e427d6 100644
--- a/programs/demos/crownscr/trunk/crownscr.asm
+++ b/programs/demos/crownscr/crownscr.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;    Crown_s Soft Screensaver v1.13m
 ;       WWW: http://www.crown-s-soft.com
@@ -34,8 +37,8 @@ copyrightlen:
 
 include "lang.inc"
 include "figuresi.inc"
-include "..\..\..\macros.inc"
-include "..\..\..\KOSfuncs.inc"
+include "..\..\macros.inc"
+include "..\..\KOSfuncs.inc"
 start:
     cmp     dword[params], '@ss'
     setz    [screensaver]
@@ -96,7 +99,7 @@ red:
 
 still:
     mcall SF_WAIT_EVENT_TIMEOUT, delay			; wait here for event
-	
+
     cmp  eax,1			; redraw request ?
     je	 red
     cmp  eax,2			; key in buffer ?
@@ -117,7 +120,7 @@ jmp  still
 key:
 	cmp  [screensaver], 0
 	jnz  close
-	
+
     mcall SF_GET_KEY
 
     cmp  al,1			; is key in buffer ?
diff --git a/programs/demos/crownscr/trunk/figuresi.inc b/programs/demos/crownscr/figuresi.inc
similarity index 100%
rename from programs/demos/crownscr/trunk/figuresi.inc
rename to programs/demos/crownscr/figuresi.inc