diff --git a/addons/atragmx/functions/fnc_update_range_card.sqf b/addons/atragmx/functions/fnc_update_range_card.sqf
index 7e19abc36e..d084754959 100644
--- a/addons/atragmx/functions/fnc_update_range_card.sqf
+++ b/addons/atragmx/functions/fnc_update_range_card.sqf
@@ -15,7 +15,7 @@
  */
 #include "script_component.hpp"
 
-private ["_range", "_elevation", "_windage1", "_windage2", "_clickSize", "_clickNumber", "_clickInterval", "_lead", "_TOF", "_velocity", "_kineticEnergy", "_rangeOutput", "_elevationOutput", "_windageOutput", "_lastColumnOutput"];
+private ["_range", "_elevation", "_windage1", "_windage2", "_clickSize", "_clickNumber", "_clickInterval", "_lead", "_TOF", "_velocity", "_kineticEnergy", "_rangeOutput", "_elevationOutput", "_windageOutput", "_lastColumnOutput", "_speedOfSound"];
 _lastColumnOutput = "";
 
 if (GVAR(showWind2) && GVAR(rangeCardCurrentColumn) == 0) then {
@@ -32,6 +32,8 @@ if (GVAR(currentUnit) == 1) then {
 
 lnbClear 5007;
 
+_speedOfSound = GVAR(temperature) call EFUNC(weather,calculateSpeedOfSound);
+
 {
     _range = _x select 0;
     _elevation = _x select 1;
@@ -72,7 +74,7 @@ lnbClear 5007;
     _windageOutput = Str(Round(_windage1 * 100) / 100);
     
     _rangeOutput = Str(_range);
-    if (_velocity < 340.29) then {
+    if (_velocity < _speedOfSound) then {
         _rangeOutput = _rangeOutput + "*";
     };
     
diff --git a/addons/weather/XEH_preInit.sqf b/addons/weather/XEH_preInit.sqf
index 2a6487f51c..177b58ec82 100644
--- a/addons/weather/XEH_preInit.sqf
+++ b/addons/weather/XEH_preInit.sqf
@@ -8,6 +8,7 @@ PREP(calculateBarometricPressure);
 PREP(calculateDewPoint);
 PREP(calculateHeatIndex);
 PREP(calculateRoughnessLength);
+PREP(calculateSpeedOfSound);
 PREP(calculateTemperatureAtHeight);
 PREP(calculateWetBulb);
 PREP(calculateWindChill);
diff --git a/addons/weather/functions/fnc_calculateSpeedOfSound.sqf b/addons/weather/functions/fnc_calculateSpeedOfSound.sqf
new file mode 100644
index 0000000000..322ba75ac5
--- /dev/null
+++ b/addons/weather/functions/fnc_calculateSpeedOfSound.sqf
@@ -0,0 +1,17 @@
+/*
+ * Author: Ruthberg
+ *
+ * Calculates the speed of sound for a given temperature
+ *
+ * Arguments:
+ * temperature - degrees celcius <NUMBER>
+ *
+ * Return Value:
+ * speed of sound - m/s <NUMBER>
+ *
+ * Return value:
+ * None
+ */
+#include "script_component.hpp"
+
+(331.3 + (0.6 * _this))
diff --git a/extensions/advanced_ballistics/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp
index 06a398f342..e276ffbea4 100644
--- a/extensions/advanced_ballistics/AdvancedBallistics.cpp
+++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp
@@ -577,7 +577,8 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function)
         positionOffset[0] += sin(bulletDir + M_PI / 2) * spinDriftPartial;
         positionOffset[1] += cos(bulletDir + M_PI / 2) * spinDriftPartial;
 
-        if (bulletSpeed < 345 && bulletSpeedAvg > 340 && bulletSpeed > 335) {
+        float speedOfSound = 331.3 + (0.6 * temperature);
+        if (bulletSpeed < (speedOfSound + 5) && bulletSpeedAvg > speedOfSound && bulletSpeed > (speedOfSound - 5)) {
             std::uniform_real_distribution<double> distribution(0.0, 1.0);
             double coef = 1.0f - bulletDatabase[index].transonicStabilityCoef;