diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c
index 97734b09..4b2f0712 100644
--- a/libisoburn/burn_wrap.c
+++ b/libisoburn/burn_wrap.c
@@ -701,12 +701,16 @@ int isoburn_report_iso_error(int iso_error_code, char msg_text[], int os_errno,
  int error_code, iso_sev, min_sev, ret;
  char *sev_text_pt, *msg_text_pt= NULL;
 
+/* <<< delete as soon as replacement appears in libisofs */
+#define ISO_ERR_CODE(e)     (e & 0x0000FFFF)
+
+
  error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code);
  if(iso_error_code<0)
    msg_text_pt= (char *) iso_error_to_msg(iso_error_code);
  if(msg_text_pt==NULL)
    msg_text_pt= msg_text;
- iso_sev= ISO_ERR_SEV(iso_error_code);
+ iso_sev= iso_error_get_severity(iso_error_code);
  sev_text_pt= min_severity;
  burn_text_to_sev(min_severity, &min_sev, 0);
  if(min_sev < iso_sev)
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 498dc809..205ff2c9 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.02.03.181259"
+#define Xorriso_timestamP "2008.02.04.093106"
diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c
index dca27c41..a9c7de03 100644
--- a/xorriso/xorrisoburn.c
+++ b/xorriso/xorrisoburn.c
@@ -298,12 +298,15 @@ int Xorriso_report_iso_error(struct XorrisO *xorriso,
  int error_code, iso_sev, min_sev, ret;
  char *sev_text_pt, *msg_text_pt= NULL;
 
+/* <<< delete as soon as replacement appears in libisofs */
+#define ISO_ERR_CODE(e)     (e & 0x0000FFFF)
+
  error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code);
  if(flag&1)
    msg_text_pt= (char *) iso_error_to_msg(iso_error_code);
  if(msg_text_pt==NULL)
    msg_text_pt= msg_text;
- iso_sev= ISO_ERR_SEV(iso_error_code);
+ iso_sev= iso_error_get_severity(iso_error_code);
  sev_text_pt= min_severity;
  burn_text_to_sev(min_severity, &min_sev, 0);
  if(min_sev < iso_sev)