diff --git a/src/components/LDeviceLocationPopup.vue b/src/components/LDeviceLocationPopup.vue
index e20f580..bd76fc6 100644
--- a/src/components/LDeviceLocationPopup.vue
+++ b/src/components/LDeviceLocationPopup.vue
@@ -13,6 +13,12 @@
         <li :title="$t('Timestamp')">
           <ClockIcon size="1x" aria-hidden="true" role="img" />
           {{ new Date(timestamp * 1000).toLocaleString($config.locale) }}
+          <span v-if="isoLocal && timeZone">
+            <br />
+            <code style="font-size: 0.7rem">
+              {{ isoLocal }}[{{ timeZone }}]
+            </code>
+          </span>
         </li>
         <li :title="$t('Location')">
           <MapPinIcon size="1x" aria-hidden="true" role="img" />
@@ -59,7 +65,6 @@
 .wrapper {
   display: flex;
   margin-top: 10px;
-  margin-right: 20px;
 
   img {
     align-self: start;
@@ -116,6 +121,14 @@ export default {
       type: Number,
       default: 0,
     },
+    isoLocal: {
+      type: String,
+      default: "",
+    },
+    timeZone: {
+      type: String,
+      default: "",
+    },
     lat: {
       type: Number,
       default: 0,
diff --git a/src/index.d.ts b/src/index.d.ts
index e228a99..5c5eea8 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -163,6 +163,10 @@ interface OTLocation {
     isorcv?: string;
     /** ISO 8601 timestamp */
     isotst?: string;
+    /** ISO 8601 timestamp in local time */
+    isolocal?: string;
+    /** tzdb time zone name */
+    tzname?: string;
     /** Latitude in degrees */
     lat: number;
     /** Longitude in degrees */
diff --git a/src/views/Map.vue b/src/views/Map.vue
index 9106c78..692aa6e 100644
--- a/src/views/Map.vue
+++ b/src/views/Map.vue
@@ -46,6 +46,8 @@
           :name="l.name"
           :face="l.face"
           :timestamp="l.tst"
+          :iso-local="l.isolocal"
+          :time-zone="l.tzname"
           :lat="l.lat"
           :lon="l.lon"
           :alt="l.alt"
@@ -53,7 +55,7 @@
           :speed="l.vel"
           :regions="l.inregions"
           :wifi="{ ssid: l.SSID, bssid: l.BSSID }"
-          :options="{ className: 'leaflet-popup--for-pin' }"
+          :options="{ className: 'leaflet-popup--for-pin', maxWidth: 400 }"
           :address="l.addr"
         />
       </LMarker>
@@ -87,6 +89,8 @@
               :name="l.name"
               :face="l.face"
               :timestamp="l.tst"
+              :iso-local="l.isolocal"
+              :time-zone="l.tzname"
               :lat="l.lat"
               :lon="l.lon"
               :alt="l.alt"