diff --git a/src/gui/webchannels_setup.cpp b/src/gui/webchannels_setup.cpp
index 36d85081c..071cb2bda 100644
--- a/src/gui/webchannels_setup.cpp
+++ b/src/gui/webchannels_setup.cpp
@@ -303,8 +303,6 @@ bool CWebChannelsSetup::changeNotify(const neutrino_locale_t OptionName, void */
 int filefilter(const struct dirent *entry)
 {
 	std::string f = entry->d_name;
-	if (f.find("epgmap.xml") != std::string::npos)
-		return 0;
 
 	int len = strlen(entry->d_name);
 	if (len > 3 && (
diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp
index 219868a46..24d63044e 100644
--- a/src/zapit/src/bouquets.cpp
+++ b/src/zapit/src/bouquets.cpp
@@ -1384,7 +1384,7 @@ void CBouquetManager::readEPGMapping()
 		while ((d = readdir(dp)) != NULL)
 		{
 			std::string f = d->d_name;
-			if (f.find("epgmap.xml") != std::string::npos)
+			if ((f.compare("epgmap.xml") == 0) || (f.find(".epgmap") != std::string::npos))
 				epgmaps.push_back((*it) + "/" + f);
 		}
 	}