diff --git a/debian/changelog b/debian/changelog
index 762bc7cc..6660ba1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ hts-tvheadend (2.6) hts; urgency=low
 
   * Support for DVB-S2 has been added
 
+  * Default character encoding in DVB is ISO6937, not Latin-1. Ticket #96
+
 hts-tvheadend (2.5) hts; urgency=low
 
   * If a previosly detected DVB adapter was not present during startup,
diff --git a/src/dvb/dvb_support.c b/src/dvb/dvb_support.c
index 06a54648..3526e115 100644
--- a/src/dvb/dvb_support.c
+++ b/src/dvb/dvb_support.c
@@ -65,7 +65,7 @@ dvb_conversion_init(void)
   }
 
   convert_utf8   = dvb_iconv_open("UTF8");
-  convert_latin1 = dvb_iconv_open("LATIN1");
+  convert_latin1 = dvb_iconv_open("ISO6937");
 }