diff --git a/src/QGCConfig.h b/src/QGCConfig.h
index a119bc823a921ce09dccd48f344422223752e6d4..b398805795880935c8c07af823756e8a67fc023e 100644
--- a/src/QGCConfig.h
+++ b/src/QGCConfig.h
@@ -12,7 +12,7 @@
 
 // If you need to make an incompatible changes to stored settings, bump this version number
 // up by 1. This will caused store settings to be cleared on next boot.
-#define QGC_SETTINGS_VERSION 3
+#define QGC_SETTINGS_VERSION 4
 
 #define QGC_APPLICATION_NAME "QGroundControl"
 #define QGC_ORG_NAME "QGroundControl.org"
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index f8ba9d11f50115ebe88a8b3d1e29dae8e172c41e..c2e906316852818bc621ff3fbae7c38f71d85038 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -465,7 +465,7 @@ void LinkManager::_updateConfigurationList(void)
 #endif
         // Is this a PX4?
         if (portInfo.vendorIdentifier() == 9900) {
-            SerialConfiguration* pSerial = _findSerialConfiguration(portInfo.portName());
+            SerialConfiguration* pSerial = _findSerialConfiguration(portInfo.systemLocation());
             if (pSerial) {
                 //-- If this port is configured make sure it has the preferred flag set
                 if(!pSerial->isPreferred()) {
@@ -477,7 +477,7 @@ void LinkManager::_updateConfigurationList(void)
                 pSerial = new SerialConfiguration(QString("Pixhawk on %1").arg(portInfo.portName().trimmed()));
                 pSerial->setPreferred(true);
                 pSerial->setBaud(115200);
-                pSerial->setPortName(portInfo.portName());
+                pSerial->setPortName(portInfo.systemLocation());
                 addLinkConfiguration(pSerial);
                 saveList = true;
             }
diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc
index 2641edd68823521abfc498c03663e47bf8956bc2..a4398aede5f8c731d143f8af54bede44e98b697a 100644
--- a/src/comm/SerialLink.cc
+++ b/src/comm/SerialLink.cc
@@ -588,7 +588,7 @@ QList<QString> SerialConfiguration::getCurrentPorts()
     QList<QSerialPortInfo> portList =  QSerialPortInfo::availablePorts();
     foreach (const QSerialPortInfo &info, portList)
     {
-        ports.append(info.portName());
+        ports.append(info.systemLocation());
     }
     return ports;
 }
diff --git a/src/ui/QGCLinkConfiguration.cc b/src/ui/QGCLinkConfiguration.cc
index 27c359319a3bff58c65b43228e72d42418a2c5e2..01bbca8d66061d23ef68305bbc725dd69766cf6e 100644
--- a/src/ui/QGCLinkConfiguration.cc
+++ b/src/ui/QGCLinkConfiguration.cc
@@ -137,10 +137,16 @@ void QGCLinkConfiguration::_fixUnnamed(LinkConfiguration* config)
     //-- Check for "Unnamed"
     if (config->name() == tr("Unnamed")) {
         switch(config->type()) {
-            case LinkConfiguration::TypeSerial:
-                config->setName(
-                    QString("Serial Device on %1").arg(dynamic_cast<SerialConfiguration*>(config)->portName()));
+            case LinkConfiguration::TypeSerial: {
+                QString tname = dynamic_cast<SerialConfiguration*>(config)->portName();
+#ifdef Q_OS_WIN32
+                tname.replace("\\\\.\\", "");
+#else
+                tname.replace("/dev/", "");
+#endif
+                config->setName(QString("Serial Device on %1").arg(tname));
                 break;
+                }
             case LinkConfiguration::TypeUdp:
                 config->setName(
                     QString("UDP Link on Port %1").arg(dynamic_cast<UDPConfiguration*>(config)->localPort()));