===================================================================
--- libs/libmythtv/dvbtypes.h   (revision 13796)
+++ libs/libmythtv/dvbtypes.h   (working copy)
@@ -44,6 +44,7 @@
 #else
   #define dvb_fe_params dvb_frontend_parameters
 #endif
+#define MPEG_TS_PKT_SIZE 188

 class QString;
 QString toString(fe_status);
Index: libs/libmythtv/dvbchannel.cpp
===================================================================
--- libs/libmythtv/dvbchannel.cpp       (revision 13796)
+++ libs/libmythtv/dvbchannel.cpp       (working copy)
@@ -47,6 +47,7 @@
 #include "dvbtypes.h"
 #include "dvbchannel.h"
 #include "dvbcam.h"
+#include "dvbrecorder.h"

 static void drain_dvb_events(int fd);
 static bool wait_for_backend(int fd, int timeout_ms);
@@ -575,6 +576,9 @@

     desired_tuning = tuning;

+    VERBOSE(VB_GENERAL, QString("invalidating DeCSA for card %1").arg(cardnum)) ;
+    DVBRecorder::UpdateDeCSAKeys(cardnum, 'I', 0, NULL, 0);
+
     if (fd_frontend < 0)
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR + "Tune(): Card not open!");
@@ -876,14 +880,14 @@

     if (DTVTunerType::kTunerTypeDVB_S2 == tuner_type)
     {
-#ifdef FE_GET_EXTENDED_INFO
+//#ifdef FE_GET_EXTENDED_INFO
         params.u.qpsk2.symbol_rate = tuning.symbolrate;
         params.u.qpsk2.fec_inner   = (fe_code_rate_t) (int) tuning.fec;
         params.u.qpsk2.modulation  = (fe_modulation_t) (int) tuning.modulation;
-#else // if !FE_GET_EXTENDED_INFO
-        VERBOSE(VB_IMPORTANT, "DVBChan Error, MythTV was compiled without "
-                "DVB-S2 headers being present so DVB-S2 tuning will fail.");
-#endif // !FE_GET_EXTENDED_INFO
+//#else // if !FE_GET_EXTENDED_INFO
+//        VERBOSE(VB_IMPORTANT, "DVBChan Error, MythTV was compiled without "
+//                "DVB-S2 headers being present so DVB-S2 tuning will fail.");
+//#endif // !FE_GET_EXTENDED_INFO
     }

     if (DTVTunerType::kTunerTypeQAM  == tuner_type)
Index: libs/libmythtv/siscan.h