diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 7cd3473c5..6ab063f01 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -450,7 +450,7 @@ tup.append_table(img_files, {
  {"3D/3DWAV", VAR_PROGS .. "/demos/3dwav/3dwav"},
  {"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/crownscr"},
  {"3D/3DCUBE2", VAR_PROGS .. "/demos/3dcube2/3DCUBE2"},
- {"3D/FREE3D04", VAR_PROGS .. "/demos/free3d04/trunk/free3d04"},
+ {"3D/FREE3D04", VAR_PROGS .. "/demos/free3d04/free3d04"},
  {"3D/GEARS", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/gears"},
  {"3D/RAY", VAR_PROGS .. "/demos/ray/ray"},
  {"3D/VIEW3DS", VAR_PROGS .. "/demos/view3ds/view3ds"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 19b78778f..b5e1ed99a 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -216,7 +216,7 @@ fasm demos\eyes\eyes.asm %BIN%\demos\eyes
 fasm demos\fire\fire.asm %BIN%\demos\fire
 fasm demos\fire2\fire2.asm %BIN%\demos\fire2
 fasm demos\firework\trunk\firework.asm %BIN%\demos\firework
-fasm demos\free3d04\trunk\free3d04.asm %BIN%\3d\free3d04
+fasm demos\free3d04\free3d04.asm %BIN%\3d\free3d04
 fasm demos\magnify\trunk\magnify.asm %BIN%\magnify
 fasm demos\movback\trunk\movback.asm %BIN%\demos\movback
 fasm demos\plasma\trunk\plasma.asm %BIN%\demos\plasma
diff --git a/programs/demos/free3d04/trunk/Tupfile.lua b/programs/demos/free3d04/Tupfile.lua
similarity index 79%
rename from programs/demos/free3d04/trunk/Tupfile.lua
rename to programs/demos/free3d04/Tupfile.lua
index 231311ca9..a2612bb16 100644
--- a/programs/demos/free3d04/trunk/Tupfile.lua
+++ b/programs/demos/free3d04/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/demos/free3d04/trunk/build_en.bat b/programs/demos/free3d04/build_en.bat
similarity index 100%
rename from programs/demos/free3d04/trunk/build_en.bat
rename to programs/demos/free3d04/build_en.bat
diff --git a/programs/demos/free3d04/trunk/build_ru.bat b/programs/demos/free3d04/build_ru.bat
similarity index 100%
rename from programs/demos/free3d04/trunk/build_ru.bat
rename to programs/demos/free3d04/build_ru.bat
diff --git a/programs/demos/free3d04/trunk/free3d04.asm b/programs/demos/free3d04/free3d04.asm
similarity index 99%
rename from programs/demos/free3d04/trunk/free3d04.asm
rename to programs/demos/free3d04/free3d04.asm
index 879522655..4d30e38b5 100644
--- a/programs/demos/free3d04/trunk/free3d04.asm
+++ b/programs/demos/free3d04/free3d04.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;   Fisheye Raycasting Engine Etc. FREE3D for MENUETOS by Dieter Marfurt
 ;   Version 0.4 (requires some texture-files to compile (see Data Section))
@@ -36,7 +39,7 @@ use32
                dd     APP_MEM;0x100000        ; esp
                dd     0x0 , 0x0               ; I_Param , I_Icon
 include 'lang.inc'
-include '..\..\..\macros.inc'
+include '..\..\macros.inc'
 COLOR_ORDER equ OTHER
 include 'gif_lite.inc'
 
@@ -296,7 +299,7 @@ m_right:                                  ; turn right
 draw_window:
 
 	mcall	12,1
-	
+
 	mcall 48, 4                             ;get skin width
 	lea	ecx, [50*65536+484+eax]             ;[y start] *65536 + [y size] + [skin_height]
 	mcall	0,<50,649>,,0x74ffffff,,title   ;draw window
diff --git a/programs/demos/free3d04/trunk/gif_lite.inc b/programs/demos/free3d04/gif_lite.inc
similarity index 100%
rename from programs/demos/free3d04/trunk/gif_lite.inc
rename to programs/demos/free3d04/gif_lite.inc
diff --git a/programs/demos/free3d04/trunk/readme.txt b/programs/demos/free3d04/readme.txt
similarity index 100%
rename from programs/demos/free3d04/trunk/readme.txt
rename to programs/demos/free3d04/readme.txt
diff --git a/programs/demos/free3d04/trunk/texture.gif b/programs/demos/free3d04/texture.gif
similarity index 100%
rename from programs/demos/free3d04/trunk/texture.gif
rename to programs/demos/free3d04/texture.gif