diff --git a/app/consapp/convbin/convbin.c b/app/consapp/convbin/convbin.c
index 6312bc183..15632fcce 100644
--- a/app/consapp/convbin/convbin.c
+++ b/app/consapp/convbin/convbin.c
@@ -602,7 +602,8 @@ static int cmdopts(int argc, char **argv, rnxopt_t *opt, char **ifile,
     if (nf>=3) opt->freqtype|=FREQTYPE_L3;
     if (nf>=4) opt->freqtype|=FREQTYPE_L4;
     if (nf>=5) opt->freqtype|=FREQTYPE_L5;
-    if (nf>=6) opt->freqtype|=FREQTYPE_ALL;
+    if (nf>=6) opt->freqtype|=FREQTYPE_L6;
+    if (nf>=7) opt->freqtype|=FREQTYPE_ALL;
     
     if (!opt->trtcm.time) {
         get_filetime(*ifile,&opt->trtcm);
diff --git a/app/qtapp/rtkconv_qt/codeopt.cpp b/app/qtapp/rtkconv_qt/codeopt.cpp
index d4d6755da..b71827350 100644
--- a/app/qtapp/rtkconv_qt/codeopt.cpp
+++ b/app/qtapp/rtkconv_qt/codeopt.cpp
@@ -514,30 +514,30 @@ void CodeOptDialog::updateEnable()
     ui->S25->setEnabled((navSystem & SYS_SBS) && (frequencyType & FREQTYPE_L3));
     ui->S26->setEnabled((navSystem & SYS_SBS) && (frequencyType & FREQTYPE_L3));
 
-    ui->C02->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
-    ui->C07->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
-    ui->C08->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
-    ui->C12->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
-    ui->C13->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
+    ui->C02->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
+    ui->C07->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
+    ui->C08->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
+    ui->C12->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
+    ui->C13->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
     ui->C18->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
     ui->C26->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L3));
     ui->C27->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L2));
     ui->C28->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L2));
     ui->C29->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L2));
     ui->C33->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L4));
-    ui->C39->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
+    ui->C39->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L6));
     ui->C40->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
     ui->C41->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
     ui->C42->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L4));
     ui->C43->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L4));
-    ui->C56->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L1));
+    ui->C56->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
     ui->C57->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L3));
     ui->C58->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L3));
     ui->C61->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L2));
     ui->C62->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L2));
     ui->C63->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L2));
-    ui->C64->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
-    ui->C65->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L5));
+    ui->C64->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L6));
+    ui->C65->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L6));
     ui->C69->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L4));
     ui->C70->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L4));
     ui->C35->setEnabled((navSystem & SYS_CMP) && (frequencyType & FREQTYPE_L4));
@@ -555,7 +555,7 @@ void CodeOptDialog::updateEnable()
     ui->I12->setEnabled((navSystem & SYS_IRN) && (frequencyType & FREQTYPE_L3));
 
     if ((navSystem == (SYS_GPS | SYS_GAL | SYS_GLO | SYS_SBS | SYS_CMP | SYS_IRN | SYS_QZS)) &&
-        (frequencyType == (FREQTYPE_L1 | FREQTYPE_L2 | FREQTYPE_L3 | FREQTYPE_L4 | FREQTYPE_L5)))
+        (frequencyType == (FREQTYPE_L1 | FREQTYPE_L2 | FREQTYPE_L3 | FREQTYPE_L4 | FREQTYPE_L5 | FREQTYPE_L6)))
         ui->btnSetAll->setText(tr("Un&set All"));
 }
 //---------------------------------------------------------------------------
diff --git a/app/qtapp/rtkconv_qt/convopt.cpp b/app/qtapp/rtkconv_qt/convopt.cpp
index b096af4ef..42dbbb233 100644
--- a/app/qtapp/rtkconv_qt/convopt.cpp
+++ b/app/qtapp/rtkconv_qt/convopt.cpp
@@ -94,6 +94,7 @@ void ConvOptDialog::updateUi()
     ui->cBFreq3->setChecked(frequencyType & FREQTYPE_L3);
     ui->cBFreq4->setChecked(frequencyType & FREQTYPE_L4);
     ui->cBFreq5->setChecked(frequencyType & FREQTYPE_L5);
+    ui->cBFreq6->setChecked(frequencyType & FREQTYPE_L6);
 
     ui->lEExcludedSatellites->setText(excludedSatellites);
     ui->cBTraceLevel->setCurrentIndex(traceLevel);
@@ -164,6 +165,7 @@ void ConvOptDialog::accept()
     if (ui->cBFreq3->isChecked()) frequencyType |= FREQTYPE_L3;
     if (ui->cBFreq4->isChecked()) frequencyType |= FREQTYPE_L4;
     if (ui->cBFreq5->isChecked()) frequencyType |= FREQTYPE_L5;
+    if (ui->cBFreq6->isChecked()) frequencyType |= FREQTYPE_L6;
 
     excludedSatellites = ui->lEExcludedSatellites->text();
     traceLevel = ui->cBTraceLevel->currentIndex();
@@ -198,6 +200,7 @@ void ConvOptDialog::showMaskDialog()
     if (ui->cBFreq3->isChecked()) frequencyType |= FREQTYPE_L3;
     if (ui->cBFreq4->isChecked()) frequencyType |= FREQTYPE_L4;
     if (ui->cBFreq5->isChecked()) frequencyType |= FREQTYPE_L5;
+    if (ui->cBFreq6->isChecked()) frequencyType |= FREQTYPE_L6;
 
     codeOptDialog->setFrequencyType(frequencyType);
 
@@ -230,6 +233,7 @@ void ConvOptDialog::updateEnable()
     ui->cBFreq3->setEnabled(ui->cBRinexVersion->currentIndex() >=1 );
     ui->cBFreq4->setEnabled(ui->cBRinexVersion->currentIndex() >=1 );
     ui->cBFreq5->setEnabled(ui->cBRinexVersion->currentIndex() >=1 );
+    ui->cBFreq6->setEnabled(ui->cBRinexVersion->currentIndex() >=1 );
     ui->cBPhaseShift->setEnabled(ui->cBRinexVersion->currentIndex() >=4 );
 }
 //---------------------------------------------------------------------------
diff --git a/app/qtapp/rtkconv_qt/convopt.ui b/app/qtapp/rtkconv_qt/convopt.ui
index c4a9a7f36..250f49ec0 100644
--- a/app/qtapp/rtkconv_qt/convopt.ui
+++ b/app/qtapp/rtkconv_qt/convopt.ui
@@ -750,6 +750,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="cBFreq6">
+           <property name="text">
+            <string>L6</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="btnMask">
            <property name="toolTip">
@@ -943,6 +950,7 @@
   <tabstop>cBFreq3</tabstop>
   <tabstop>cBFreq4</tabstop>
   <tabstop>cBFreq5</tabstop>
+  <tabstop>cBFreq6</tabstop>
   <tabstop>btnMask</tabstop>
   <tabstop>btnFcn</tabstop>
   <tabstop>btnFrequencies</tabstop>
diff --git a/src/rtklib.h b/src/rtklib.h
index bf466712e..7c153b6fc 100644
--- a/src/rtklib.h
+++ b/src/rtklib.h
@@ -289,12 +289,13 @@ extern "C" {
 #define OBSTYPE_SNR 0x08                /* observation type: SNR */
 #define OBSTYPE_ALL 0xFF                /* observation type: all */
 
-#define FREQTYPE_L1 0x01                /* frequency type: L1/E1/B1 */
-#define FREQTYPE_L2 0x02                /* frequency type: L2/E5b/B2 */
-#define FREQTYPE_L3 0x04                /* frequency type: L5/E5a/L3 */
-#define FREQTYPE_L4 0x08                /* frequency type: L6/E6/B3 */
-#define FREQTYPE_L5 0x10                /* frequency type: E5ab */
-#define FREQTYPE_ALL 0xFF               /* frequency type: all */
+#define FREQTYPE_L1 0x01                /* Frequency type: L1/G1/E1/B1 */
+#define FREQTYPE_L2 0x02                /* Frequency type: L2/G2/E5b/B2 */
+#define FREQTYPE_L3 0x04                /* Frequency type: L5/G3/E5a/B2a */
+#define FREQTYPE_L4 0x08                /* Frequency type: L6/E6/B3 */
+#define FREQTYPE_L5 0x10                /* Frequency type: E5ab/B1C/B1A */
+#define FREQTYPE_L6 0x20                /* Frequency type: B2ab */
+#define FREQTYPE_ALL 0xFF               /* Frequency type: all */
 
 #define CODE_NONE   0                   /* obs code: none or unknown */
 #define CODE_L1C    1                   /* obs code: L1C/A,G1C/A,E1C (GPS,GLO,GAL,QZS,SBS) */