diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index f57f3ca04..eb4429fd5 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -598,6 +598,12 @@ void GNSSFlowgraph::set_signals_list()
             11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
             29, 30, 31, 32, 33, 34, 35, 36};
 
+    /*
+     * Only 24 operational
+     */
+    std::set<unsigned int> available_glonass_prn = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+                    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27};
+
     std::string sv_list = configuration_->property("Galileo.prns", std::string("") );
 
     if( sv_list.length() > 0 )
@@ -646,6 +652,22 @@ void GNSSFlowgraph::set_signals_list()
                 }
         }
 
+    sv_list = configuration_->property("Glonass.prns", std::string("") );
+
+    if( sv_list.length() > 0 )
+        {
+            // Reset the available prns:
+            std::set< unsigned int > tmp_set;
+            boost::tokenizer<> tok( sv_list );
+            std::transform( tok.begin(), tok.end(), std::inserter( tmp_set, tmp_set.begin() ),
+                    boost::lexical_cast<unsigned int, std::string> );
+
+            if( tmp_set.size() > 0 )
+                {
+                    available_glonass_prn = tmp_set;
+                }
+        }
+
     if (configuration_->property("Channels_1C.count", 0) > 0 )
         {
             /*
@@ -716,6 +738,20 @@ void GNSSFlowgraph::set_signals_list()
                             *available_gnss_prn_iter), std::string("5X")));
                 }
         }
+
+        if (configuration_->property("Channels_1G.count", 0) > 0 )
+        {
+            /*
+             * Loop to create the list of GLONASS L1 C/A signals
+             */
+            for (available_gnss_prn_iter = available_glonass_prn.begin();
+                    available_gnss_prn_iter != available_glonass_prn.end();
+                    available_gnss_prn_iter++)
+                {
+                    available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Glonass"),
+                            *available_gnss_prn_iter), std::string("5X")));
+                }
+        }
     /*
      * Ordering the list of signals from configuration file
      */
@@ -729,6 +765,7 @@ void GNSSFlowgraph::set_signals_list()
             std::string gnss_system;
             if((gnss_signal.compare("1C") == 0) or (gnss_signal.compare("2S") == 0) ) gnss_system = "GPS";
             if((gnss_signal.compare("1B") == 0) or (gnss_signal.compare("5X") == 0) ) gnss_system = "Galileo";
+            if((gnss_signal.compare("1G") == 0)/* or (gnss_signal.compare("") == 0)*/) gnss_system = "Glonass";
             unsigned int sat = configuration_->property("Channel" + boost::lexical_cast<std::string>(i) + ".satellite", 0);
             LOG(INFO) << "Channel " << i <<  " system " << gnss_system << ", signal " << gnss_signal <<", sat "<<sat;
             if (sat == 0) // 0 = not PRN in configuration file