diff --git a/src/gui/ext_update.cpp b/src/gui/ext_update.cpp
index cd207c287..77bad1dad 100644
--- a/src/gui/ext_update.cpp
+++ b/src/gui/ext_update.cpp
@@ -121,7 +121,7 @@ bool CExtUpdate::ErrorReset(bool modus, const std::string & msg1, const std::str
 
 bool CExtUpdate::writemtdExt(const std::string & filename)
 {
-	imgFilename = "/tmp/" + FILESYSTEM_ENCODING_TO_UTF8_STRING(filename);
+	imgFilename = (std::string)g_settings.update_dir + "/" + FILESYSTEM_ENCODING_TO_UTF8_STRING(filename);
 	DBG_TIMER_START()
 	bool ret = writemtdExt();
 	DBG_TIMER_STOP("Image bearbeiten")
@@ -446,6 +446,7 @@ bool CExtUpdate::readBackupList(const std::string & dstPath)
 	size_t pos;
 	while(fgets(buf, sizeof(buf), f1) != NULL) {
 		std::string line = buf;
+		// remove comments
 		line = trim(line);
 		if (line.find_first_of("#") == 0)
 			continue;
@@ -476,8 +477,8 @@ bool CExtUpdate::readBackupList(const std::string & dstPath)
 		std::string dst = dstPath + line;
 		if ((line.find("*") != std::string::npos) || (line.find("?") != std::string::npos)) {
 			// Wildcards
-			WRITE_UPDATE_LOG("\n");
 			DBG_MSG("Wildcards: %s\n", dst.c_str());
+			WRITE_UPDATE_LOG("\n");
 			WRITE_UPDATE_LOG("--------------------\n");
 			WRITE_UPDATE_LOG("Wildcards: %s\n", dst.c_str());
 			copyFileList(line, dstPath);
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index aa236ffda..61c971baa 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -534,11 +534,11 @@ void CFlashExpert::readmtd(int preadmtd)
 	gettimeofday(&tv, NULL);	
 	strftime(tmpStr, sizeof(tmpStr), "_%Y%m%d_%H%M.img", localtime(&tv.tv_sec));
 	CMTDInfo* mtdInfo = CMTDInfo::getInstance();
-	std::string filename = "/tmp/" + mtdInfo->getMTDName(preadmtd);
+	std::string filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd);
 	filename += tmpStr;
 
 	if (preadmtd == -1) {
-		filename = "/tmp/flashimage.img"; // US-ASCII (subset of UTF-8 and ISO8859-1)
+		filename = (std::string)g_settings.update_dir + "/flashimage.img"; // US-ASCII (subset of UTF-8 and ISO8859-1)
 		preadmtd = MTD_OF_WHOLE_IMAGE;
 	}
 	setTitle(LOCALE_FLASHUPDATE_TITLEREADFLASH);
@@ -585,7 +585,7 @@ void CFlashExpert::writemtd(const std::string & filename, int mtdNumber)
 	CFlashTool ft;
 	ft.setStatusViewer( this );
 	ft.setMTDDevice( CMTDInfo::getInstance()->getMTDFileName(mtdNumber) );
-	if(!ft.program( "/tmp/" + filename, 50, 100)) {
+	if(!ft.program( (std::string)g_settings.update_dir + "/" + filename, 50, 100)) {
 		showStatusMessageUTF(ft.getErrorMessage()); // UTF-8
 		sleep(10);
 	} else {
@@ -634,7 +634,7 @@ void CFlashExpert::showFileSelector(const std::string & actionkey)
 	fileselector->addIntroItems(LOCALE_FLASHUPDATE_FILESELECTOR, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
 
 	struct dirent **namelist;
-	int n = scandir("/tmp", &namelist, 0, alphasort);
+	int n = scandir(g_settings.update_dir, &namelist, 0, alphasort);
 	if (n < 0)
 	{
 		perror("no flashimages available");