diff --git a/acinclude.m4 b/acinclude.m4
index 2393c27cb..f4f44ac7a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -164,6 +164,9 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
 	[--with-plugindir_var=PATH     ],[where to find the plugins in /var])
 
+TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/plugins/webtv,
+	[--with-webtvdir_var=PATH      ],[where to find the livestreamScriptPath in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
 	[--with-plugindir_mnt=PATH     ],[where to find the the extern plugins])
 
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index 3b786e5ac..2936e61d9 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -280,7 +280,7 @@ CTimerList::CTimerList()
 	Timer = new CTimerdClient();
 	timerNew_message = "";
 	timerNew_pluginName = "";
-	httpConnectTimeout = 3;
+	httpConnectTimeout = 300; // ms
 	changed = false;
 
 	/* most probable default */
diff --git a/src/gui/widget/helpbox.cpp b/src/gui/widget/helpbox.cpp
index c1c27f8e0..a2be659f5 100644
--- a/src/gui/widget/helpbox.cpp
+++ b/src/gui/widget/helpbox.cpp
@@ -100,6 +100,7 @@ void Helpbox::addLine(const std::string& icon, const std::string& text, const in
 		int x_text = w_picon + (picon ? OFFSET_INNER_MID : 0);
 		CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, 0, text, text_mode, font);
 		txt->doPaintBg(false);
+		txt->forceTextPaint();
 #if 0 //"contrast agent", if you want to see where the text items are drawn.
 		txt->setColorBody(COL_RED);
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index b07eeadf6..aa647f6cb 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -997,7 +997,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.infoClockSeconds = configfile.getInt32("infoClockSeconds", 0); //NI
 
 	g_settings.livestreamResolution = configfile.getInt32("livestreamResolution", 1920);
-	g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", PLUGINDIR_VAR "/webtv");
+	g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", WEBTVDIR_VAR);
 
 	g_settings.version_pseudo = configfile.getString("version_pseudo", "19700101000000");
 
diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
index 72cbae5f7..4dbe7930e 100644
--- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -457,6 +457,7 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
 			else if (ycmd_name.compare("GAMESDIR"))		yresult = GAMESDIR;
 			else if (ycmd_name.compare("PLUGINDIR"))	yresult = PLUGINDIR;
 			else if (ycmd_name.compare("PLUGINDIR_VAR"))	yresult = PLUGINDIR_VAR;
+			else if (ycmd_name.compare("WEBTVDIR_VAR"))	yresult = WEBTVDIR_VAR;
 			else if (ycmd_name.compare("LUAPLUGINDIR"))	yresult = LUAPLUGINDIR;
 			else if (ycmd_name.compare("LOCALEDIR"))	yresult = LOCALEDIR;
 			else if (ycmd_name.compare("LOCALEDIR_VAR"))	yresult = LOCALEDIR_VAR;
diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp
index 2bb6535df..4d81dd131 100644
--- a/src/system/httptool.cpp
+++ b/src/system/httptool.cpp
@@ -67,7 +67,7 @@ int CHTTPTool::show_progress( void *clientp, double dltotal, double dlnow, doubl
 	return 0;
 }
 //#define DEBUG
-bool CHTTPTool::downloadFile(const std::string & URL, const char * const downloadTarget, int globalProgressEnd, int connecttimeout/*=10*/, int timeout/*=1800*/)
+bool CHTTPTool::downloadFile(const std::string & URL, const char * const downloadTarget, int globalProgressEnd, int connecttimeout/*=10000*/, int timeout/*=1800*/)
 {
 	CURL *curl;
 	CURLcode res;
@@ -100,7 +100,7 @@ printf("url is %s\n", URL.c_str());
 		curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str());
 		curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
-		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, connecttimeout);
+		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, connecttimeout);
 		curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
 		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false); //NI
 #ifdef DEBUG
@@ -139,7 +139,7 @@ printf("download code %d\n", res);
 	return res==CURLE_OK;
 }
 
-std::string CHTTPTool::downloadString(const std::string & URL, int globalProgressEnd, int connecttimeout/*=10*/, int timeout/*=1800*/)
+std::string CHTTPTool::downloadString(const std::string & URL, int globalProgressEnd, int connecttimeout/*=10000*/, int timeout/*=1800*/)
 {
 	CURL *curl;
 	CURLcode res;
@@ -165,7 +165,7 @@ printf("url is %s\n", URL.c_str());
 		curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent.c_str());
 		curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
-		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, connecttimeout);
+		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, connecttimeout);
 		curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
 		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
 #ifdef DEBUG
diff --git a/src/system/httptool.h b/src/system/httptool.h
index 919cf4dbb..845cc3bf6 100644
--- a/src/system/httptool.h
+++ b/src/system/httptool.h
@@ -52,8 +52,8 @@ class CHTTPTool
 		CHTTPTool();
 		void setStatusViewer( CProgressWindow* statusview );
 
-		bool downloadFile( const std::string & URL, const char * const downloadTarget, int globalProgressEnd=-1, int connecttimeout=10, int timeout=1800);
-		std::string downloadString(const std::string & URL, int globalProgressEnd=-1, int connecttimeout=10, int timeout=1800);
+		bool downloadFile( const std::string & URL, const char * const downloadTarget, int globalProgressEnd=-1, int connecttimeout=10000, int timeout=1800);
+		std::string downloadString(const std::string & URL, int globalProgressEnd=-1, int connecttimeout=10000, int timeout=1800);
 
 };