diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
@@ -33,6 +33,7 @@ void ScanWizard::SetupConfig(
     m_ftaOnly = new FreeToAirOnly();
     m_lcnOnly = new ChannelNumbersOnly();
     m_completeOnly = new CompleteChannelsOnly();
+    m_fullSearch = new FullChannelSearch();
     m_addFullTS = new AddFullTS();
     m_trustEncSI = new TrustEncSISetting();
 
@@ -42,6 +43,7 @@ void ScanWizard::SetupConfig(
     addChild(m_ftaOnly);
     addChild(m_lcnOnly);
     addChild(m_completeOnly);
+    addChild(m_fullSearch);
     addChild(m_addFullTS);
     addChild(m_trustEncSI);
 
@@ -88,6 +90,11 @@ bool ScanWizard::DoCompleteChannelsOnly(void) const
     return m_completeOnly->boolValue();
 }
 
+bool ScanWizard::DoFullChannelSearch(void) const
+{
+    return m_fullSearch->boolValue();
+}
+
 bool ScanWizard::DoAddFullTS(void) const
 {
     return m_addFullTS->boolValue();

diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.h b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.h
@@ -45,6 +45,7 @@ class DesiredServices;
 class FreeToAirOnly;
 class ChannelNumbersOnly;
 class CompleteChannelsOnly;
+class FullChannelSearch;
 class AddFullTS;
 class TrustEncSISetting;
 

diff --git a/mythtv/libs/libmythtv/scanwizard.cpp b/mythtv/libs/libmythtv/scanwizard.cpp
@@ -139,6 +139,7 @@ void ScanWizard::Scan()
                            DoFreeToAirOnly(),
                            DoChannelNumbersOnly(),
                            DoCompleteChannelsOnly(),
+                           DoFullChannelSearch(),
                            GetServiceRequirements());
         ci.Process(transports, sourceid);
     }
@@ -182,6 +183,7 @@ void ScanWizard::Scan()
             DoIgnoreSignalTimeout(),  DoFollowNIT(),
             DoTestDecryption(),       DoFreeToAirOnly(),
             DoChannelNumbersOnly(),   DoCompleteChannelsOnly(),
+            DoFullChannelSearch(),
             DoAddFullTS(),            GetServiceRequirements(),
             // stuff needed for particular scans
             GetMultiplex(),         start_chan,

diff --git a/mythtv/libs/libmythtv/scanwizard.h b/mythtv/libs/libmythtv/scanwizard.h
@@ -90,20 +90,22 @@ class MTV_PUBLIC ScanWizard : public GroupSetting
     bool    DoFreeToAirOnly(void)        const;
     bool    DoChannelNumbersOnly(void)   const;
     bool    DoCompleteChannelsOnly(void) const;
+    bool    DoFullChannelSearch(void)    const;
     bool    DoAddFullTS(void)            const;
     bool    DoTestDecryption(void)       const;
 
   protected:
-    VideoSourceSelector  *m_videoSource {nullptr};
-    InputSelector        *m_input       {nullptr};
-    ScanTypeSetting      *m_scanType    {nullptr};
-    ScanOptionalConfig   *m_scanConfig  {nullptr};
-    DesiredServices      *m_services    {nullptr};
-    FreeToAirOnly        *m_ftaOnly     {nullptr};
-    ChannelNumbersOnly   *m_lcnOnly     {nullptr};
-    CompleteChannelsOnly *m_completeOnly{nullptr};
-    AddFullTS            *m_addFullTS   {nullptr};
-    TrustEncSISetting    *m_trustEncSI  {nullptr};
+    VideoSourceSelector  *m_videoSource   {nullptr};
+    InputSelector        *m_input         {nullptr};
+    ScanTypeSetting      *m_scanType      {nullptr};
+    ScanOptionalConfig   *m_scanConfig    {nullptr};
+    DesiredServices      *m_services      {nullptr};
+    FreeToAirOnly        *m_ftaOnly       {nullptr};
+    ChannelNumbersOnly   *m_lcnOnly       {nullptr};
+    CompleteChannelsOnly *m_completeOnly  {nullptr};
+    FullChannelSearch    *m_fullSearch    {nullptr};
+    AddFullTS            *m_addFullTS     {nullptr};
+    TrustEncSISetting    *m_trustEncSI    {nullptr};
 // End of members moved from ScanWizardConfig
 };
 

diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp
@@ -276,6 +276,7 @@ int main(int argc, char *argv[])
     bool    scanFTAOnly = false;
     bool    scanLCNOnly = false;
     bool    scanCompleteOnly = false;
+    bool    scanFullChannelSearch = false;
     bool    addFullTS = false;
     ServiceRequirements scanServiceRequirements = kRequireAV;
     uint    scanCardId = 0;
@@ -369,6 +370,8 @@ int main(int argc, char *argv[])
         scanLCNOnly = true;
     if (cmdline.toBool("completeonly"))
         scanCompleteOnly = true;
+    if (cmdline.toBool("fullsearch"))
+        scanFullChannelSearch = true;
     if (cmdline.toBool("addfullts"))
         addFullTS = true;
     if (cmdline.toBool("servicetype"))
@@ -526,6 +529,7 @@ int main(int argc, char *argv[])
                          scanFTAOnly,
                          scanLCNOnly,
                          scanCompleteOnly,
+                         scanFullChannelSearch,
                          addFullTS,
                          scanServiceRequirements,
                          // stuff needed for particular scans
@@ -560,7 +564,8 @@ int main(int argc, char *argv[])
         {
             ScanDTVTransportList list = LoadScan(scanImport);
             ChannelImporter ci(false, true, true, true, false,
-                               scanFTAOnly, scanLCNOnly, scanCompleteOnly, scanServiceRequirements);
+                               scanFTAOnly, scanLCNOnly, scanCompleteOnly,
+                               scanFullChannelSearch, scanServiceRequirements);
             ci.Process(list);
         }
         cout<<"*** SCAN IMPORT END ***"<<endl;