diff --git a/data/config/settingsupdate.conf b/data/config/settingsupdate.conf
index 07653e999..84a91d2d2 100644
--- a/data/config/settingsupdate.conf
+++ b/data/config/settingsupdate.conf
@@ -3,7 +3,7 @@
 #:LogFile=/tmp/update.log
 
 
-## M�gliche Eintr�ge f�r Sicherungen:
+## Mögliche Einträge für Sicherungen:
 #====================================
 # ganzes Verzeichnis
 #-------------------
@@ -18,11 +18,11 @@
 # /bin/*.sh
 
 #------------------------------------------------------------------------------------------------
-## Die Verzeichnisse "/", "/dev", "/proc", "/sys", "/mnt", "/tmp" k�nnen nicht gesichert werden!!
+## Die Verzeichnisse "/", "/dev", "/proc", "/sys", "/mnt", "/tmp" können nicht gesichert werden!!
 #------------------------------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
-## vor der Sicherung aus dem neuen Image zu l�schende Dateien/Verzeichnisse,
+## vor der Sicherung aus dem neuen Image zu löschende Dateien/Verzeichnisse,
 ## gekennzeichnet durch ein vorangestelltes ~
 # z.B.
 # ~/share/tuxbox/neutrino/themes/Classic.theme
@@ -51,21 +51,20 @@
 /var/tuxbox/config/srv.conf
 /var/tuxbox/config/flex/flex_eigene_scripte.conf
 /var/bin/
+/var/etc/
 /var/keys/
-/etc/auto.net*
 /etc/exports
-/etc/fstab
 /etc/hostname
 /etc/hosts
-/etc/resolv.conf
-/etc/profile.local
 /etc/network/interfaces
-/etc/wpa_supplicant.conf
 /etc/passwd
+/etc/profile.local
+/etc/resolv.conf
+/etc/wpa_supplicant.conf
 
-## Pers�nliche Sicherungen
+## Persönliche Sicherungen
 
 
 #----------------------------------------------------------------------------------------
-## von der Sicherung auszuschlie�ende Dateien, gekennzeichnet durch ein vorangestelltes -
+## von der Sicherung auszuschließende Dateien, gekennzeichnet durch ein vorangestelltes -
 #----------------------------------------------------------------------------------------
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 6dfe7434a..c823cd1ed 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1516,10 +1516,10 @@ menu.hint_net_telnet Enable telnet login to your box
 menu.hint_net_test Test network connection: ping gateway,\n name server and external IP
 menu.hint_net_ushare Share connected HDD over uPnp
 menu.hint_net_xupnpd Share live channels over UPNP
-menu.hint_netfs_automount_write Save automount entries and write /etc/auto.net
+menu.hint_netfs_automount_write Save automount entries and write %s
 menu.hint_netfs_fstab_domount Mount fstab entries
 menu.hint_netfs_fstab_doumount Umount fstab entries
-menu.hint_netfs_fstab_write Save fstab entries and write /etc/fstab
+menu.hint_netfs_fstab_write Save fstab entries and write %s
 menu.hint_netfs_menu_main_automount Configure automount entries
 menu.hint_netfs_menu_main_fstab Configure fstab entries
 menu.hint_netfs_menu_main_head Fstab and automount configuration
@@ -2193,7 +2193,7 @@ mpkey.time Show time
 netfs.active_onoff Entry active
 netfs.automount_edit Edit auto.net
 netfs.automount_head NetFS settings
-netfs.automount_intro /etc/auto.net entries
+netfs.automount_intro auto.net entries
 netfs.automount_intro_mounts edit NetFS mounts
 netfs.automount_write save settings and write auto.net
 netfs.automount_write_info auto.net written
@@ -2204,7 +2204,7 @@ netfs.fstab_domount_info Running '/etc/init.d/fstab start_netfs'
 netfs.fstab_doumount unmount NetFS directory
 netfs.fstab_doumount_info Running '/etc/init.d/fstab stop_netfs'
 netfs.fstab_head NetFS settings
-netfs.fstab_intro /etc/fstab entries
+netfs.fstab_intro fstab entries
 netfs.fstab_intro_mounts Edit NetFS mounts
 netfs.fstab_write save settings and write fstab
 netfs.fstab_write_info fstab written
diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale
index 21a3a54b7..69f166b7e 100644
--- a/data/locale/slovak.locale
+++ b/data/locale/slovak.locale
@@ -1442,10 +1442,10 @@ menu.hint_net_telnet Použitie telnet prihlásenia do vášho prijímača
 menu.hint_net_test Test sieťového pripojenia: ping brány,\n názov servera a externé IP
 menu.hint_net_ushare Zdielanie pripojeného HDD cez uPnp
 menu.hint_net_xupnpd Zdielanie "Živých kanálov" cez uPnp
-menu.hint_netfs_automount_write Uloženie autopripojených záznamov a zapísanie /etc/auto.net
+menu.hint_netfs_automount_write Uloženie autopripojených záznamov a zapísanie %s
 menu.hint_netfs_fstab_domount Pripojenie fstab záznamov
 menu.hint_netfs_fstab_doumount Odpojenie fstab záznamov
-menu.hint_netfs_fstab_write Uloženie fstab záznamov a zapísanie /etc/fstab
+menu.hint_netfs_fstab_write Uloženie fstab záznamov a zapísanie %s
 menu.hint_netfs_menu_main_automount Konfigurácia automount záznamov
 menu.hint_netfs_menu_main_fstab Konfigurácia fstab záznamov
 menu.hint_netfs_menu_main_head Fstab a automount konfigurácia
@@ -2100,18 +2100,18 @@ mpkey.time Zobrazenie času
 netfs.active_onoff Aktivovať
 netfs.automount_edit Upraviť auto.net
 netfs.automount_head NetFS nastavenia
-netfs.automount_intro /etc/auto.net záznamov
+netfs.automount_intro auto.net záznamov
 netfs.automount_intro_mounts Upraviť NetFS pripojenia
 netfs.automount_write Uložiť nastavenia a uložiť auto.net
 netfs.automount_write_info Súbor auto.net uložený
 netfs.dump Výpis
 netfs.fstab_edit Upraviť fstab
 netfs.fstab_domount Pripojiť NetFS zložku
-netfs.fstab_domount_info NGfstab beží
+netfs.fstab_domount_info '/etc/init.d/fstab start_netfs' beží
 netfs.fstab_doumount Odpojiť NetFS zložku
-netfs.fstab_doumount_info NGfstab beží
+netfs.fstab_doumount_info '/etc/init.d/fstab start_netfs' beží
 netfs.fstab_head NetFS nastavenia
-netfs.fstab_intro /etc/fstab záznamy
+netfs.fstab_intro fstab záznamy
 netfs.fstab_intro_mounts Upraviť NetFS pripojenia
 netfs.fstab_write Uložiť nastavenia a uloženie fstab
 netfs.fstab_write_info Súbor fstab uložený
diff --git a/data/scripts/backup.sh b/data/scripts/backup.sh
index d3126b3cb..2c1aa0a8b 100644
--- a/data/scripts/backup.sh
+++ b/data/scripts/backup.sh
@@ -8,9 +8,7 @@ USRF="/var/tuxbox/config/tobackup.conf"
 BAKF="$1/${2:-settings_${HOST}_${DATE}.tar.gz}"
 
 TOBACKUP="\
-	/etc/auto.net \
 	/etc/exports \
-	/etc/fstab \
 	/etc/hostname \
 	/etc/network/interfaces \
 	/etc/passwd \
diff --git a/data/scripts/backup_flash.sh b/data/scripts/backup_flash.sh
index 026efa9a6..357265fd7 100644
--- a/data/scripts/backup_flash.sh
+++ b/data/scripts/backup_flash.sh
@@ -7,7 +7,7 @@ VAR="/var/"
 USRF="/var/tuxbox/config/tobackup.conf"
 BAKF="/var/backup_flash.tar.gz"
 
-TOBACKUP="/etc/auto.net*"
+TOBACKUP=""
 
 SHOWINFO "backup to ${BAKF} ..."
 
diff --git a/data/y-web/Y_NI_Menue.yhtm b/data/y-web/Y_NI_Menue.yhtm
index e2bb30243..47ec5f57d 100644
--- a/data/y-web/Y_NI_Menue.yhtm
+++ b/data/y-web/Y_NI_Menue.yhtm
@@ -11,8 +11,8 @@
 				<li><a target="work" href="Y_NI_Infoicons-control.yhtm">{=L:ni.infoicons-control=}</a></li>
 				<li>{=L:ni.netfs-control=}</li>
 				<ul style="margin-left: 1em">
-					<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=0&mount_type_s=fstab">{=if-file-exists:/var/etc/fstab~/var/etc/fstab~/etc/fstab=}</a></li>
-					<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=1&mount_type_s=automount">{=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}</a></li>
+					<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=0&mount_type_s=fstab">/var/etc/fstab</a></li>
+					<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=1&mount_type_s=automount">/var/etc/auto.net</a></li>
 				</ul>
 				<li><a target="work" href="Y_NI_Plugin-control.yhtm">{=L:ni.plugin-control=}</a></li>
 				<li><a target="work" href="Y_NI_Camd-control.yhtm">{=L:ni.camd-control=}</a></li>
diff --git a/data/y-web/Y_Settings_automount.yhtm b/data/y-web/Y_Settings_automount.yhtm
index 8368de139..abfaa0812 100644
--- a/data/y-web/Y_Settings_automount.yhtm
+++ b/data/y-web/Y_Settings_automount.yhtm
@@ -4,7 +4,7 @@
 //<![CDATA[
 function automount_edit()
 {
-	var mstr = loadSyncURL("/control/exec?Y_Tools&automount_getline&{=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}&{=R1=}");
+	var mstr = loadSyncURL("/control/exec?Y_Tools&automount_getline&/var/etc/auto.net&{=R1=}");
 	mstr = mstr.replace(/\t/gi," ");
 	mstr = mstr.replace(/[ ]+/gi," ");
 
@@ -108,8 +108,7 @@ function do_save2()
 	show_waitbox(false);
 	mstr = mstr.replace(/=/gi,",,");
 
-	//NI var _url ="/control/exec?Y_Tools&automount_setline&/var/etc/auto.net&"+mountname+"&"+mstr;
-	var _url ="/control/exec?Y_Tools&automount_setline&{=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}&"+mountname+"&"+mstr;
+	var _url ="/control/exec?Y_Tools&automount_setline&/var/etc/auto.net&"+mountname+"&"+mstr;
 	var res = loadSyncURL(_url);
 	window.document.location.href="/Y_Settings_automount_liste.yhtm";
 }
diff --git a/data/y-web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh b/data/y-web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh
index 46928839b..d683ee4ed 100755
--- a/data/y-web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh
+++ b/data/y-web/extentions/boxinfo/files/httpd/scripts/Y_Ext_BoxInfo.sh
@@ -55,8 +55,8 @@ case "$1" in
 			if [ -e /etc/smb.conf ]; then
 				do_cmd 'Samba Server configuration' cat /etc/smb.conf
 			fi
-			if [ -e /etc/auto.net ]; then
-				do_cmd 'auto mounter configuration' cat /etc/auto.net
+			if [ -e /var/etc/auto.net ]; then
+				do_cmd 'auto mounter configuration' cat /var/etc/auto.net
 			fi
 		fi
 		;;
diff --git a/data/y-web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh
index 7803af155..6f55e1442 100644
--- a/data/y-web/scripts/Y_Tools.sh
+++ b/data/y-web/scripts/Y_Tools.sh
@@ -306,7 +306,7 @@ do_automount_getline()
 do_automount_setline()
 {
 	if ! [ -e $1 ]; then
-		cp /etc/auto.net $1
+		cp /var/etc/auto.net $1
 	fi
 	filename=$1
 	mountname=`echo "$2"|sed -e "s;---;;g"`
diff --git a/src/gui/netfs_setup.cpp b/src/gui/netfs_setup.cpp
index b4ac83408..ab507ce4b 100644
--- a/src/gui/netfs_setup.cpp
+++ b/src/gui/netfs_setup.cpp
@@ -57,17 +57,8 @@ CNETFSMountGui::CNETFSMountGui()
 	
 	width = 50;
 
-	fstabPath = checkVarPath("/etc/fstab");
-	autoPath = checkVarPath("/etc/auto.net");
-}
-
-std::string CNETFSMountGui::checkVarPath(const std::string &file)
-{
-	std::string var = "/var" + file;
-	if(file_exists(var.c_str()))
-		return(var);
-	else
-		return(file);
+	fstabPath = "/var/etc/fstab";
+	autoPath = "/var/etc/auto.net";
 }
 
 std::string CNETFSMountGui::getEntryString(int mt, int i)
diff --git a/src/gui/netfs_setup.h b/src/gui/netfs_setup.h
index 948379c64..dee2a248f 100644
--- a/src/gui/netfs_setup.h
+++ b/src/gui/netfs_setup.h
@@ -46,7 +46,6 @@ class CNETFSMountGui : public CMenuTarget
 		CFSMounter::FS_Support m_cifs_sup;
 
 		int vinit(int mt);
-		std::string checkVarPath(const std::string &file); /// returns path for persistent var partitions
 
 	protected:
 		int width;