diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index fb3cbf5e2..61aef9023 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -265,10 +265,11 @@ bool CFlashUpdate::selectHttpImage(void)
 bool CFlashUpdate::getUpdateImage(const std::string & version)
 {
 	CHTTPTool httpTool;
+	char const * fname;
 	char dest_name[100];
 	httpTool.setStatusViewer(this);
 
-	const char *fname = rindex(filename.c_str(), '/');
+	fname = rindex(filename.c_str(), '/');
 	if(fname != NULL) fname++;
 	else return false;
 
@@ -362,7 +363,7 @@ printf("[update] mode is %d\n", g_settings.softupdate_mode);
 			return false;
 		}
 		hide();
-		const char *ptr = rindex(filename.c_str(), '.');
+		char const * ptr = rindex(filename.c_str(), '.');
 		if(ptr) {
 			ptr++;
 			if(!strcmp(ptr, "bin")) fileType = 'A';
@@ -408,7 +409,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
 
 	if(g_settings.softupdate_mode==1) //internet-update
 	{
-		const char * fname = rindex(filename.c_str(), '/') +1;
+		char const * fname = rindex(filename.c_str(), '/') +1;
 		char fullname[255];
 
 		if(!getUpdateImage(newVersion)) {
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index bac802953..3a122ca88 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -609,13 +609,13 @@ printf("CSubtitleChangeExec::exec: action %s\n", actionKey.c_str());
 		return menu_return::RETURN_EXIT;
 	}
 	if(!strncmp(actionKey.c_str(), "DVB", 3)) {
-		const char *pidptr = strchr(actionKey.c_str(), ':');
+		char const * pidptr = strchr(actionKey.c_str(), ':');
 		int pid = atoi(pidptr+1);
 		tuxtx_stop_subtitle();
 		dvbsub_pause();
 		dvbsub_start(pid);
 	} else {
-		const char *ptr = strchr(actionKey.c_str(), ':');
+		char const * ptr = strchr(actionKey.c_str(), ':');
 		ptr++;
 		int pid = atoi(ptr);
 		ptr = strchr(ptr, ':');