diff --git a/addons/markers/functions/fnc_canTimestamp.sqf b/addons/markers/functions/fnc_canTimestamp.sqf
index 5d9234f04ae..ee10139dfa7 100644
--- a/addons/markers/functions/fnc_canTimestamp.sqf
+++ b/addons/markers/functions/fnc_canTimestamp.sqf
@@ -20,7 +20,7 @@ params [["_unit", ACE_player]];
 private _assignedItems = assignedItems _unit;
 
 private _index = _assignedItems findIf {
-    ([_x] call EFUNC(common,getItemType)) isEqualTo ["item", "watch"]
+    ([_x] call EFUNC(common,getItemType) select 1) in ["watch", "gps", "uav_terminal"]
 };
 
 _index != -1
diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml
index cda5dce3f22..b601080f1cf 100644
--- a/addons/markers/stringtable.xml
+++ b/addons/markers/stringtable.xml
@@ -426,14 +426,14 @@
             <Chinesesimp>UTC时间</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Markers_TimestampTooltipNoWatch">
-            <English>Watch Required</English>
+            <English>Watch, GPS or UAV Terminal Required</English>
             <French>Une montre est requise.</French>
             <Spanish>Reloj requerido</Spanish>
             <Italian>Necessario orologio</Italian>
             <Polish>Wymagany zegarek</Polish>
             <Portuguese>Relógio necessário</Portuguese>
             <Russian>Необходимы часы</Russian>
-            <German>Uhr benötigt</German>
+            <German>Uhr, GPS oder UAV Terminal benötigt</German>
             <Korean>시계 필요함</Korean>
             <Japanese>時計が必要</Japanese>
             <Chinesesimp>需要手表</Chinesesimp>