diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 26de30774a..6d7ac3818c 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -354,6 +354,15 @@
     "configurationGPS": {
         "message": "GPS"
     },
+    "configurationGPStype": {
+        "message": "Type"
+    },
+    "configurationGPSbaudrate": {
+        "message": "Baudrate"
+    },
+    "configurationGPSubxSbas": {
+        "message": "Ground Assistance Type"
+    },
     "configurationSerialRX": {
         "message": "Serial Receiver"
     },
diff --git a/tabs/configuration.css b/tabs/configuration.css
index 0c861d7023..380b1bac49 100644
--- a/tabs/configuration.css
+++ b/tabs/configuration.css
@@ -73,6 +73,22 @@
     margin-left: 10px;
     line-height: 20px;
 }
+.tab-configuration .gps .line {
+    clear: left;
+}
+.tab-configuration .gps select {
+    float: left;
+
+    width: 100px;
+    height: 20px;
+
+    margin: 0 10px 5px 0;
+
+    border: 1px solid silver;
+}
+.tab-configuration .gps span {
+    line-height: 20px;
+}
 .tab-configuration .serialRX {
     width: 125px;
 
diff --git a/tabs/configuration.html b/tabs/configuration.html
index a85669cabe..a5e3741a6d 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -2,7 +2,7 @@
     <div class="leftWrapper">
         <div class="groupTitle" i18n="configurationMixer"></div>
         <select class="mixerList" size="10">
-            <!-- mixer list generated here -->
+            <!-- list generated here -->
         </select>
         <div class="mixerPreview">
             <img src="./images/motor_order/custom.svg" />
@@ -12,7 +12,7 @@
     <div class="rightWrapper">
         <div class="groupTitle" i18n="configurationFeatures"></div>
         <dl class="features">
-            <!-- feature list generated here -->
+            <!-- list generated here -->
         </dl>
     </div>
     <div class="clear-both"></div>
@@ -108,12 +108,31 @@
         </div>
     </div>
     <div class="clear-both"></div>
-    <div class="leftWrapper">
+    <div class="leftWrapper gps">
         <div class="groupTitle" i18n="configurationGPS"></div>
+        <div class="line">
+            <select class="gps_type">
+                <!-- list generated here -->
+            </select>
+            <span i18n="configurationGPStype"></span>
+        </div>
+        <div class="line">
+            <select class="gps_baudrate">
+                <!-- list generated here -->
+            </select>
+            <span i18n="configurationGPSbaudrate"></span>
+        </div>
+        <div class="line">
+            <select class="gps_ubx_sbas">
+                <!-- list generated here -->
+            </select>
+            <span i18n="configurationGPSubxSbas"></span>
+        </div>
     </div>
     <div class="rightWrapper">
         <div class="groupTitle" i18n="configurationSerialRX"></div>
         <select class="serialRX" size="4">
+            <!-- list generated here -->
         </select>
     </div>
     <div class="clear-both"></div>
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 1941157598..b801a9d314 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -119,6 +119,69 @@ TABS.configuration.initialize = function (callback) {
             features_e.append(element);
         }
 
+        // generate GPS
+        var gpsTypes = [
+            'NMEA',
+            'UBLOX',
+            'MTK_NMEA',
+            'MTK_BINARY',
+            'MAG_BINARY'
+        ];
+
+        var gpsBauds = [
+            '115200',
+            '57600',
+            '38400',
+            '19200',
+            '9600'
+        ];
+
+        var gpsSbas = [
+            'Auto-detect',
+            'European EGNOS',
+            'North American WAAS',
+            'Japanese MSAS',
+            'Indian GAGAN'
+        ];
+
+        var gps_type_e = $('select.gps_type');
+        for (var i = 0; i < gpsTypes.length; i++) {
+            gps_type_e.append('<option value="' + i + '">' + gpsTypes[i] + '</option>');
+        }
+
+        gps_type_e.change(function () {
+            var val = parseInt($(this).val());
+
+            MISC.gps_type = val;
+        });
+
+        var gps_baudrate_e = $('select.gps_baudrate');
+        for (var i = 0; i < gpsBauds.length; i++) {
+            gps_baudrate_e.append('<option value="' + i + '">' + gpsBauds[i] + '</option>');
+        }
+
+        gps_baudrate_e.change(function () {
+            var val = parseInt($(this).val());
+
+            MISC.gps_baudrate = val;
+        });
+
+        var gps_ubx_sbas_e = $('select.gps_ubx_sbas');
+        for (var i = 0; i < gpsSbas.length; i++) {
+            gps_ubx_sbas_e.append('<option value="' + i + '">' + gpsSbas[i] + '</option>');
+        }
+
+        gps_ubx_sbas_e.change(function () {
+            var val = parseInt($(this).val());
+
+            MISC.gps_ubx_sbas = val;
+        });
+
+        // select current gps configuration
+        gps_type_e.val(MISC.gps_type);
+        gps_baudrate_e.val(MISC.gps_baudrate);
+        gps_ubx_sbas_e.val(MISC.gps_ubx_sbas);
+
         // generate serial RX
         var serialRXtypes = [
             'SPEKTRUM1024',
@@ -129,10 +192,10 @@ TABS.configuration.initialize = function (callback) {
 
         var serialRX_e = $('select.serialRX');
         for (var i = 0; i < serialRXtypes.length; i++) {
-            serialRX_e.append('<option value="' + (i) + '">' + serialRXtypes[i] + '</option>');
+            serialRX_e.append('<option value="' + i + '">' + serialRXtypes[i] + '</option>');
         }
 
-        serialRX_e.change(function() {
+        serialRX_e.change(function () {
             var val = parseInt($(this).val());
 
             BF_CONFIG.serialrx_type = val;