diff --git a/data/scripts/backup.sh b/data/scripts/backup.sh
index 2c1aa0a8b..2d2098c61 100644
--- a/data/scripts/backup.sh
+++ b/data/scripts/backup.sh
@@ -3,7 +3,7 @@
 . /etc/init.d/globals
 
 HOST=$(hostname)
-DATE=$(date +%Y-%m-%d_%H-%M-%S)
+DATE=$(date +%Y%m%d_%H%M)
 USRF="/var/tuxbox/config/tobackup.conf"
 BAKF="$1/${2:-settings_${HOST}_${DATE}.tar.gz}"
 
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index 7c946b2a3..62471be7e 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -43,7 +43,7 @@
 
 #include <driver/display.h>
 #include <driver/screen_max.h>
-#include <driver/display.h>
+#include <lib/libnet/libnet.h>
 #include <system/helpers.h>
 #include <system/debug.h>
 
@@ -106,8 +106,11 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
 				return res;
 		}
 
-		std::string fname = "neutrino.conf";
-		CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname);
+		std::string hostName = "";
+		netGetHostname(hostName);
+		std::string timeStr = getNowTimeStr("_%Y%m%d_%H%M");
+		std::string fname = "neutrino_" + hostName + timeStr + ".conf";
+		CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname, 45);
 		sms->exec(NULL, "");
 		delete sms;