diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index b8b4687d6..97812ddbb 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -458,7 +458,7 @@ tup.append_table(img_files, {
  {"DEMOS/EYES", VAR_PROGS .. "/demos/eyes/trunk/eyes"},
  {"DEMOS/FIREWORK", VAR_PROGS .. "/demos/firework/firework"},
  {"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/trunk/movback"},
- {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/trunk/plasma"},
+ {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/plasma"},
  {"DEMOS/SPIRAL", VAR_PROGS .. "/demos/spiral/spiral"},
  {"DEMOS/TINYFRAC", VAR_PROGS .. "/demos/tinyfrac/trunk/tinyfrac"},
  {"DEMOS/TRANTEST", VAR_PROGS .. "/demos/trantest/trunk/trantest"},
diff --git a/programs/demos/plasma/trunk/Tupfile.lua b/programs/demos/plasma/Tupfile.lua
similarity index 79%
rename from programs/demos/plasma/trunk/Tupfile.lua
rename to programs/demos/plasma/Tupfile.lua
index 0f14570ce..09a037302 100644
--- a/programs/demos/plasma/trunk/Tupfile.lua
+++ b/programs/demos/plasma/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/plasma/trunk/plasma.asm b/programs/demos/plasma/plasma.asm
similarity index 100%
rename from programs/demos/plasma/trunk/plasma.asm
rename to programs/demos/plasma/plasma.asm
diff --git a/programs/demos/plasma/trunk/build_en.bat b/programs/demos/plasma/trunk/build_en.bat
deleted file mode 100644
index d0407c43a..000000000
--- a/programs/demos/plasma/trunk/build_en.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@erase lang.inc
-@echo lang fix en_US >lang.inc
-@fasm plasma.asm plasma
-@erase lang.inc
-@pause
diff --git a/programs/demos/plasma/trunk/build_ru.bat b/programs/demos/plasma/trunk/build_ru.bat
deleted file mode 100644
index ee8302c88..000000000
--- a/programs/demos/plasma/trunk/build_ru.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@erase lang.inc
-@echo lang fix ru_RU >lang.inc
-@fasm plasma.asm plasma
-@erase lang.inc
-@pause