diff --git a/libisoburn/trunk/libisoburn/isofs_wrap.c b/libisoburn/trunk/libisoburn/isofs_wrap.c
index 91b4b8ef..06fb12c3 100644
--- a/libisoburn/trunk/libisoburn/isofs_wrap.c
+++ b/libisoburn/trunk/libisoburn/isofs_wrap.c
@@ -496,6 +496,11 @@ int isoburn_start_emulation(struct isoburn *o, int flag)
    s = burn_disc_get_status(drive);
    o->fabricated_disc_status= s;
    burn_disc_track_lba_nwa(drive, NULL, 0, &dummy, &(o->nwa));
+
+   /* >>> Debian Bug#632865 ? */
+   if(o->nwa < o->zero_nwa)
+     o->zero_nwa= 0;
+
    {ret= 1; goto ex;}
  } else if (capacity > 0 || role == 2 || role == 4) {
    /* Might be a block device on a system where libburn cannot determine its
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 92f18198..e28f4f22 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.07.05.145103"
+#define Xorriso_timestamP "2011.07.06.190111"