diff --git a/xorriso/write_run.c b/xorriso/write_run.c
index be3b5d4e..14e2f398 100644
--- a/xorriso/write_run.c
+++ b/xorriso/write_run.c
@@ -652,6 +652,18 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
  }
 
  s= isoburn_disc_get_status(drive);
+ if (xorriso->do_hfsplus && (
+     (xorriso->grow_blindly_msc2 >= 0 &&
+       xorriso->out_drive_handle != xorriso->in_drive_handle)
+     ||
+     (xorriso->out_drive_handle == xorriso->in_drive_handle && 
+      s != BURN_DISC_BLANK)
+    )) {
+   sprintf(xorriso->info_text,
+           "May not grow ISO image while -hfsplus is enabled");
+   Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
+   {ret= 0; goto ex;}
+ }
  if(xorriso->out_drive_handle == xorriso->in_drive_handle) {
    if(abs(xorriso->displacement_sign) == 1 && xorriso->displacement != 0 &&
       s != BURN_DISC_BLANK) {
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 92c3ef15..4563fbbe 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.06.14.142958"
+#define Xorriso_timestamP "2012.06.15.085732"