diff --git a/data/eng/Makefile b/data/eng/Makefile
index 4b44665869..16b63c48f9 100644
--- a/data/eng/Makefile
+++ b/data/eng/Makefile
@@ -285,7 +285,7 @@ CMM_PROGRAMS:=\
 # Some of them are auto-built with special rules, some just exist before build.
 # Each item is of the form <local name>:<name inside image>.
 # Spaces should be represented as |.
-OTHER_FILES:=autorun.dat:AUTORUN.DAT \
+OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  settings/icon.ini:SETTINGS/ICON.INI \
diff --git a/data/eng/autorun.dat b/data/eng/settings/autorun.dat
similarity index 100%
rename from data/eng/autorun.dat
rename to data/eng/settings/autorun.dat
diff --git a/data/et/Makefile b/data/et/Makefile
index 4b44665869..16b63c48f9 100644
--- a/data/et/Makefile
+++ b/data/et/Makefile
@@ -285,7 +285,7 @@ CMM_PROGRAMS:=\
 # Some of them are auto-built with special rules, some just exist before build.
 # Each item is of the form <local name>:<name inside image>.
 # Spaces should be represented as |.
-OTHER_FILES:=autorun.dat:AUTORUN.DAT \
+OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  settings/icon.ini:SETTINGS/ICON.INI \
diff --git a/data/et/autorun.dat b/data/et/settings/autorun.dat
similarity index 100%
rename from data/et/autorun.dat
rename to data/et/settings/autorun.dat
diff --git a/data/it/Makefile b/data/it/Makefile
index baab3596ef..59307b59bc 100644
--- a/data/it/Makefile
+++ b/data/it/Makefile
@@ -284,7 +284,7 @@ CMM_PROGRAMS:=\
 # Some of them are auto-built with special rules, some just exist before build.
 # Each item is of the form <local name>:<name inside image>.
 # Spaces should be represented as |.
-OTHER_FILES:=autorun.dat:AUTORUN.DAT \
+OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  settings/icon.ini:SETTINGS/ICON.INI \
diff --git a/data/it/autorun.dat b/data/it/settings/autorun.dat
similarity index 100%
rename from data/it/autorun.dat
rename to data/it/settings/autorun.dat
diff --git a/data/rus/Makefile b/data/rus/Makefile
index ed32da9270..a1fccdd9c2 100644
--- a/data/rus/Makefile
+++ b/data/rus/Makefile
@@ -279,7 +279,7 @@ CMM_PROGRAMS:=\
 # Spaces should be represented as |.
 #
 # yogev_ezra: Removed '3dsheart' to free some space on RAMDISK. This demo has 90% in common with VIEW3DS 
-OTHER_FILES:=autorun.dat:AUTORUN.DAT \
+OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  settings/icon.ini:SETTINGS/ICON.INI \
diff --git a/data/rus/autorun.dat b/data/rus/settings/autorun.dat
similarity index 100%
rename from data/rus/autorun.dat
rename to data/rus/settings/autorun.dat
diff --git a/data/sp/Makefile b/data/sp/Makefile
index c595ba0f5d..415ce3ab20 100644
--- a/data/sp/Makefile
+++ b/data/sp/Makefile
@@ -284,7 +284,7 @@ CMM_PROGRAMS:=\
 # Some of them are auto-built with special rules, some just exist before build.
 # Each item is of the form <local name>:<name inside image>.
 # Spaces should be represented as |.
-OTHER_FILES:=autorun.dat:AUTORUN.DAT \
+OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  settings/icon.ini:SETTINGS/ICON.INI \
diff --git a/data/sp/autorun.dat b/data/sp/settings/autorun.dat
similarity index 100%
rename from data/sp/autorun.dat
rename to data/sp/settings/autorun.dat
diff --git a/programs/system/launcher/trunk/launcher.asm b/programs/system/launcher/trunk/launcher.asm
index 6b05666cbd..ee4916ef0d 100644
--- a/programs/system/launcher/trunk/launcher.asm
+++ b/programs/system/launcher/trunk/launcher.asm
@@ -238,7 +238,7 @@ START:                           ; start of execution
                    dd 0
    .blocks         dd 16*512       ; 16*512 bytes max
    .address        dd file_data
-   db "AUTORUN.DAT",0
+   db "/SYS/SETTINGS/AUTORUN.DAT",0
 
  start_info:
    .mode           dd 7