diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 05b6447f69eb40a1a7dd2d63068ba470483fb72a..19b4a68dda6050122608c262da01a60b1dae39d1 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -405,7 +405,8 @@ HEADERS += \
     src/api/QGCOptions.h \
     src/api/QGCSettings.h \
     src/api/QmlComponentInfo.h \
-    src/comm/MavlinkMessagesTimer.h
+    src/comm/MavlinkMessagesTimer.h \
+    src/GPS/Drivers/src/base_station.h
 
 SOURCES += \
     src/api/QGCCorePlugin.cc \
@@ -664,6 +665,7 @@ HEADERS += \
     src/GPS/Drivers/src/rtcm.h \
     src/GPS/Drivers/src/ashtech.h \
     src/GPS/Drivers/src/ubx.h \
+    src/GPS/Drivers/src/sbf.h \
     src/GPS/GPSManager.h \
     src/GPS/GPSPositionMessage.h \
     src/GPS/GPSProvider.h \
@@ -851,6 +853,7 @@ SOURCES += \
     src/GPS/Drivers/src/rtcm.cpp \
     src/GPS/Drivers/src/ashtech.cpp \
     src/GPS/Drivers/src/ubx.cpp \
+    src/GPS/Drivers/src/sbf.cpp \
     src/GPS/GPSManager.cc \
     src/GPS/GPSProvider.cc \
     src/GPS/RTCM/RTCMMavlink.cc \
diff --git a/src/GPS/GPSManager.cc b/src/GPS/GPSManager.cc
index 6c71e0c490adc194941142eb15a7d5e8f3fa4542..4eea19b8e08e476d02598f3b6b0751d75e871f40 100644
--- a/src/GPS/GPSManager.cc
+++ b/src/GPS/GPSManager.cc
@@ -34,6 +34,9 @@ void GPSManager::connectGPS(const QString& device, const QString& gps_type)
     if (gps_type.contains("trimble",  Qt::CaseInsensitive)) {
         type = GPSProvider::GPSType::trimble;
         qCDebug(RTKGPSLog) << "Connecting Trimble device";
+    } else if (gps_type.contains("septentrio",  Qt::CaseInsensitive)) {
+        type = GPSProvider::GPSType::septentrio;
+        qCDebug(RTKGPSLog) << "Connecting Septentrio device";
     } else {
         type = GPSProvider::GPSType::u_blox;
         qCDebug(RTKGPSLog) << "Connecting U-blox device";
diff --git a/src/GPS/GPSProvider.cc b/src/GPS/GPSProvider.cc
index 7f8433efdcc90463b5f7e25ac30fdc8c7f004d75..285f1b269c308e8346da4e19532bed2ff43db1df 100644
--- a/src/GPS/GPSProvider.cc
+++ b/src/GPS/GPSProvider.cc
@@ -18,6 +18,7 @@
 #include <QDebug>
 
 #include "Drivers/src/ubx.h"
+#include "Drivers/src/sbf.h"
 #include "Drivers/src/ashtech.h"
 #include "Drivers/src/base_station.h"
 #include "definitions.h"
@@ -81,6 +82,9 @@ void GPSProvider::run()
         if (_type == GPSType::trimble) {
             gpsDriver = new GPSDriverAshtech(&callbackEntry, this, &_reportGpsPos, _pReportSatInfo);
             baudrate = 115200;
+        } else if (_type == GPSType::septentrio) {
+            gpsDriver = new GPSDriverSBF(&callbackEntry, this, &_reportGpsPos, _pReportSatInfo, 5);
+            baudrate = 0; // auto-configure
         } else {
             gpsDriver = new GPSDriverUBX(GPSDriverUBX::Interface::UART, &callbackEntry, this, &_reportGpsPos, _pReportSatInfo);
             baudrate = 0; // auto-configure
diff --git a/src/GPS/GPSProvider.h b/src/GPS/GPSProvider.h
index eabd08847e4eeb1bb25a0d3a54fc2b10826acadc..56e8d30b83ece9240bbf87ce142e49db34c662db 100644
--- a/src/GPS/GPSProvider.h
+++ b/src/GPS/GPSProvider.h
@@ -32,7 +32,8 @@ public:
 
     enum class GPSType {
         u_blox,
-        trimble
+        trimble,
+        septentrio
     };
 
     GPSProvider(const QString& device,
diff --git a/src/GPS/definitions.h b/src/GPS/definitions.h
index 63fd2c2b100a1ae34a43f1eceb1dd25a30d23468..afc36a47552a8dfc7e9ba016407cf44569b6884d 100644
--- a/src/GPS/definitions.h
+++ b/src/GPS/definitions.h
@@ -50,6 +50,8 @@
 #include "vehicle_gps_position.h"
 #include "satellite_info.h"
 
+#define M_DEG_TO_RAD 		M_PI / 180.0
+#define M_RAD_TO_DEG 		180.0 / M_PI
 #define M_DEG_TO_RAD_F 		0.01745329251994f
 #define M_RAD_TO_DEG_F 		57.2957795130823f