diff --git a/.gitignore b/.gitignore
index c2890967b..4f8e80caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ Makefile
 autom4te.cache
 *.in
 aclocal.m4
+compile
 config.*
 configure
 depcomp
diff --git a/.svnignore b/.svnignore
deleted file mode 100644
index e44c6013e..000000000
--- a/.svnignore
+++ /dev/null
@@ -1,12 +0,0 @@
-autom4te.cache
-*.in
-aclocal.m4
-config.*
-configure
-depcomp
-install-sh
-*.pc
-libtool
-ltmain.sh
-missing
-stamp.h1
diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
index e91b4b143..3f1a2fc66 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -839,8 +839,11 @@ std::string  CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
 std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
 {
 	std::string boxvendor(g_info.hw_caps->boxvendor);
-	std::string boxname(g_info.hw_caps->boxname);
+	/* stay compatible with present code in Y_Blocks.txt */
+	if (boxvendor.compare("Coolstream") == 0)
+		boxvendor = "CST";
 
+	std::string boxname(g_info.hw_caps->boxname);
 	/* workaround for Neo2 */
 	if ((boxname.compare("Neo") == 0) && (CFEManager::getInstance()->getFrontendCount() > 1))
 		boxname += " Twin";