diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index b6b62b9..8d9c7c7 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2018.10.10.160301"
+#define Cdrskin_timestamP "2018.10.11.074048"
diff --git a/libburn/write.c b/libburn/write.c
index 42faba3..eccb92f 100644
--- a/libburn/write.c
+++ b/libburn/write.c
@@ -440,7 +440,7 @@ static int add_isrc_cue(struct cue_sheet *sheet, unsigned char ctladr, int tno,
 {
 	unsigned char *unit;
 	int i, ret;
-	char text[8];
+	char text[8 + 21]; /* should suffice for 64 bit oversize */
 
 	ret = new_cue(sheet, 2, 0);
 	if (ret <= 0)
@@ -454,6 +454,9 @@ static int add_isrc_cue(struct cue_sheet *sheet, unsigned char ctladr, int tno,
 	unit[5] = isrc->owner[1];
 	unit[6] = isrc->owner[2];
 	sprintf(text, "%-2.2u%-5.5u", (unsigned int) isrc->year, isrc->serial);
+	sprintf(text, "%-2.2u", (unsigned int) isrc->year);
+	sprintf(text + 2, "%-5.5u", isrc->serial);
+	text[7] = 0;
 	unit[7] = text[0];
 	for (i = 1; i < 7; i++)
 		unit[9 + i] = text[i];