diff --git a/data/eng/Makefile b/data/eng/Makefile
index 9b75b57dc3..26b82b027b 100644
--- a/data/eng/Makefile
+++ b/data/eng/Makefile
@@ -296,7 +296,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  settings/menu.dat:SETTINGS/MENU.DAT \
  settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
- settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
+ settings/panel.ini:SETTINGS/PANEL.INI \
+ settings/setup.dat:SETTINGS/SETUP.DAT \
  shell:SHELL table:TABLE \
  vmode:VMODE 3d/3dsheart:3D/3DSHEART \
  3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \
diff --git a/data/eng/setup.dat b/data/eng/settings/setup.dat
similarity index 100%
rename from data/eng/setup.dat
rename to data/eng/settings/setup.dat
diff --git a/data/et/Makefile b/data/et/Makefile
index 9b75b57dc3..26b82b027b 100644
--- a/data/et/Makefile
+++ b/data/et/Makefile
@@ -296,7 +296,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  settings/menu.dat:SETTINGS/MENU.DAT \
  settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
- settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
+ settings/panel.ini:SETTINGS/PANEL.INI \
+ settings/setup.dat:SETTINGS/SETUP.DAT \
  shell:SHELL table:TABLE \
  vmode:VMODE 3d/3dsheart:3D/3DSHEART \
  3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \
diff --git a/data/et/setup.dat b/data/et/settings/setup.dat
similarity index 100%
rename from data/et/setup.dat
rename to data/et/settings/setup.dat
diff --git a/data/it/Makefile b/data/it/Makefile
index 8cdf3aa812..1149b01ba3 100644
--- a/data/it/Makefile
+++ b/data/it/Makefile
@@ -295,7 +295,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  settings/menu.dat:SETTINGS/MENU.DAT \
  settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
- settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
+ settings/panel.ini:SETTINGS/PANEL.INI \
+ settings/setup.dat:SETTINGS/SETUP.DAT \
  shell:SHELL table:TABLE \
  vmode:VMODE 3d/3dsheart:3D/3DSHEART \
  3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \
diff --git a/data/it/setup.dat b/data/it/settings/setup.dat
similarity index 100%
rename from data/it/setup.dat
rename to data/it/settings/setup.dat
diff --git a/data/rus/Makefile b/data/rus/Makefile
index b647f0ebd6..67e79bf468 100644
--- a/data/rus/Makefile
+++ b/data/rus/Makefile
@@ -290,7 +290,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  settings/menu.dat:SETTINGS/MENU.DAT \
  settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
- settings/panel.ini:SETTINGS/PANEL.INI pipetka:PIPETKA setup.dat:SETUP.DAT \
+ settings/panel.ini:SETTINGS/PANEL.INI pipetka:PIPETKA \
+ settings/setup.dat:SETTINGS/SETUP.DAT \
  shell:SHELL table:TABLE vmode:VMODE \
  3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \
  demos/ak47.lif:DEMOS/AK47.LIF demos/life2:DEMOS/LIFE2 \
diff --git a/data/rus/setup.dat b/data/rus/settings/setup.dat
similarity index 100%
rename from data/rus/setup.dat
rename to data/rus/settings/setup.dat
diff --git a/data/sp/Makefile b/data/sp/Makefile
index 8588ff9ff6..a13a9881cd 100644
--- a/data/sp/Makefile
+++ b/data/sp/Makefile
@@ -295,7 +295,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  settings/menu.dat:SETTINGS/MENU.DAT \
  settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
- settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
+ settings/panel.ini:SETTINGS/PANEL.INI \
+ settings/setup.dat:SETTINGS/SETUP.DAT \
  shell:SHELL table:TABLE \
  vmode:VMODE 3d/3dsheart:3D/3DSHEART \
  3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \
diff --git a/data/sp/setup.dat b/data/sp/settings/setup.dat
similarity index 100%
rename from data/sp/setup.dat
rename to data/sp/settings/setup.dat
diff --git a/programs/system/setup/trunk/setup.asm b/programs/system/setup/trunk/setup.asm
index b822c17873..f950d64661 100644
--- a/programs/system/setup/trunk/setup.asm
+++ b/programs/system/setup/trunk/setup.asm
@@ -853,7 +853,7 @@ save_fileinfo:
         dd 0
         dd 28
         dd keyboard
-file_name:      db '/sys/setup.dat',0
+file_name:      db '/SYS/SETTINGS/SETUP.DAT',0
 ;-------------------------------------------------------------------------------
 keyboard        dd 0x0
 syslang         dd 0x4  ; 4 - rus