diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c
index 456d0b36..99c91020 100644
--- a/xorriso/parse_exec.c
+++ b/xorriso/parse_exec.c
@@ -2618,6 +2618,10 @@ malformed:;
  strcpy(xorriso->vol_uuid, num_text);
  xorriso->gpt_guid_mode= 2; /* Disk GUID from vol_uuid */
  strcpy(xorriso->all_file_dates, "set_to_mtime");
+ xorriso->do_override_now_time= 1;
+ xorriso->now_time_override= tsec;
+ Xorriso_set_libisofs_now(xorriso, 0);
+
  sprintf(xorriso->info_text,
          "Environment variable SOURCE_DATE_EPOCH encountered with value %s",
          sec_text);
@@ -2630,8 +2634,12 @@ malformed:;
                           xorriso->all_file_dates);
  Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
  sprintf(xorriso->info_text,
-                       "SOURCE_DATE_EPOCH : -boot_image any volume_date_uuid");
+         "SOURCE_DATE_EPOCH : -boot_image any gpt_disk_guid=volume_date_uuid");
  Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
+ sprintf(xorriso->info_text,
+                   "SOURCE_DATE_EPOCH : -iso_nowtime =%.f", (double) tsec);
+ Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
+
  return(1);
 }
 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 7be81dba..26b6069c 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2019.04.18.092737"
+#define Xorriso_timestamP "2019.04.18.092941"