diff -Naur tvheadend-9999.old/data/conf/charset tvheadend-9999/data/conf/charset
--- tvheadend-9999.old/data/conf/charset	2013-05-21 11:30:46.256390657 +0200
+++ tvheadend-9999/data/conf/charset	2013-05-21 11:57:23.243395815 +0200
@@ -14,13 +14,6 @@
 		"description": "Astra 19.2E TVP"
 	},
 	{
-		"tsid": 1111,
-		"onid": 1,
-		"charset": "PL_AUTO",
-		"sid": 7296,
-		"description": "Astra 19.2E TV Trwam"
-	},
-	{
 		"tsid": 8100,
 		"onid": 156,
 		"charset": "PL_AUTO",
@@ -67,98 +60,98 @@
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 ITI/Nka HD PL"
+		"description": "Hotbird 13.0 NC+ HD PL"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13020,
-		"description": "Hotbird 13.0 Cyfra+ Canal+ HD Polska"
+		"description": "Hotbird 13.0 NC+ Canal+ HD PL"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13022,
-		"description": "Hotbird 13.0 Cyfra+ Canal+ Sport HD Polska"
+		"description": "Hotbird 13.0 NC+ Canal+ Sport HD Polska"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13023,
-		"description": "Hotbird 13.0 Cyfra+ National Geographic HD Polska"
+		"description": "Hotbird 13.0 NC+ Nat Geographic HD Polska"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13025,
-		"description": "Hotbird 13.0 Cyfra+ Filmbox HD"
+		"description": "Hotbird 13.0 NC+ Filmbox HD"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13026,
-		"description": "Hotbird 13.0 Cyfra+ AXN Spin HD"
+		"description": "Hotbird 13.0 NC+ AXN Spin HD"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13027,
-		"description": "Hotbird 13.0 Cyfra+ TVN 7 HD"
+		"description": "Hotbird 13.0 NC+ TVN 7 HD"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13070,
-		"description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
+		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13080,
-		"description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
+		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13081,
-		"description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
+		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
 	},
 	{
 		"tsid": 400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13082,
-		"description": "Hotbird 13.0 Cyfra+ Eurosport HD PL"
+		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
 	},
 	{
 		"tsid": 1000,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 ITI/Nka TVN"
+		"description": "Hotbird 13.0 NC+ TVN"
 	},
 	{
 		"tsid": 1100,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 Cyfra+"
+		"description": "Hotbird 13.0 NC+"
 	},
 	{
 		"tsid": 1300,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 ITI/Nka"
+		"description": "Hotbird 13.0 NC+"
 	},
 	{
 		"tsid": 1400,
@@ -179,14 +172,14 @@
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 Cyfra+"
+		"description": "Hotbird 13.0 NC+"
 	},
 	{
 		"tsid": 1600,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 ITI/Nka EskaTV, TVN"
+		"description": "Hotbird 13.0 NC+"
 	},
 	{
 		"tsid": 1800,
@@ -270,42 +263,49 @@
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 Cyfra+"
+		"description": "Hotbird 13.0 NC+"
 	},
 	{
 		"tsid": 11100,
 		"onid": 318,
 		"charset": "PL_AUTO",
-		"sid": 4661,
-		"description": "Hotbird 13.0 Eutelsat Wedding TV"
+		"sid": 4680,
+		"description": "Hotbird 13.0 Eutelsat 13th Street PL"
 	},
 	{
 		"tsid": 11200,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 Polsat Cyfrowy PPV"
+		"description": "Hotbird 13.0 Polsat Cyfrowy"
 	},
 	{
 		"tsid": 11400,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 Cyfra+"
+		"description": "Hotbird 13.0 NC+"
+	},
+	{
+		"tsid": 11500,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 17309,
+		"description": "Hotbird 13.0 Baby TV PL"
 	},
 	{
 		"tsid": 11600,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 ITI/Nka"
+		"description": "Hotbird 13.0 NC+"
 	},
 	{
 		"tsid": 11900,
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 Cyfra+"
+		"description": "Hotbird 13.0 NC+"
 	},
 	{
 		"tsid": 12000,
@@ -347,21 +347,70 @@
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 0,
-		"description": "Hotbird 13.0 Viacom MTV / VH1 Polska"
+		"description": "Hotbird 13.0 MTV Networks"
 	},
 	{
 		"tsid": 13000,
 		"onid": 318,
 		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 Globecast Orange PL"
+		"sid": 14602,
+		"description": "Hotbird 13.0 Globecast BBC Entertainment"
 	},
 	{
-		"tsid": 13100,
+		"tsid": 13000,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 14603,
+		"description": "Hotbird 13.0 Globecast BBC Knowledge"
+	},
+	{
+		"tsid": 13000,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 14604,
+		"description": "Hotbird 13.0 Globecast BBC Lifestyle"
+	},
+	{
+		"tsid": 13000,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 14605,
+		"description": "Hotbird 13.0 Globecast BBC Cbeebies"
+	},
+	{
+		"tsid": 13000,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 14612,
+		"description": "Hotbird 13.0 Globecast IDiscovery"
+	},
+	{
+		"tsid": 13000,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 14613,
+		"description": "Hotbird 13.0 Globecast TLC Polska"
+	},
+	{
+		"tsid": 13000,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 14619,
+		"description": "Hotbird 13.0 Globecast MTV Dance"
+	},
+	{
+		"tsid": 13000,
+		"onid": 318,
+		"charset": "PL_AUTO",
+		"sid": 14620,
+		"description": "Hotbird 13.0 Globecast Viasat Explorer"
+	},
+	{
+		"tsid": 13000,
 		"onid": 318,
 		"charset": "PL_AUTO",
-		"sid": 7322,
-		"description": "Hotbird 13.0 TV5 Monde Europe"
+		"sid": 14621,
+		"description": "Hotbird 13.0 Globecast ESPN America"
 	},
 	{
 		"tsid": 13100,
@@ -396,7 +445,7 @@
 		"onid": 318,
 		"charset": "PL_AUTO",
 		"sid": 13511,
-		"description": "Hotbird 13.0 Rebel TV"
+		"description": "Hotbird 13.0 RBL.TV"
 	},
 	{
 		"tsid": 15700,