diff --git a/Makefile b/Makefile
index beb06ec3c..4b9676bf3 100644
--- a/Makefile
+++ b/Makefile
@@ -721,11 +721,11 @@ PACKAGE_NAME      := OpenPilot
 PACKAGE_SEP       := -
 PACKAGE_FULL_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL)
 
-include $(ROOT_DIR)/package/$(UNAME).mk
-
 # Source distribution is never dirty because it uses git archive
 DIST_NAME := $(DIST_DIR)/$(subst dirty-,,$(PACKAGE_FULL_NAME)).tar
 
+include $(ROOT_DIR)/package/$(UNAME).mk
+
 ##############################
 #
 # Source code formatting
diff --git a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp
index 5cebee5af..7c25f784a 100644
--- a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp
@@ -166,7 +166,11 @@ void UsageTrackerPlugin::collectUsageParameters(QMap<QString, QString> &paramete
         parameters["bl_version"]   = QString::number(utilMngr->getBootloaderRevision());
         parameters["fw_tag"] = devDesc.gitTag;
         parameters["fw_hash"] = devDesc.gitHash;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
         parameters["os_version"]   = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture();
+#else
+        parameters["os_version"]   = "none";
+#endif
         parameters["os_threads"]   = QString::number(QThread::idealThreadCount());
         parameters["os_timezone"]  = QTimeZone::systemTimeZoneId();
         parameters["gcs_version"]  = VersionInfo::revision();