diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c
index 4fe06bf..a0fcece 100644
--- a/cdrskin/cdrskin.c
+++ b/cdrskin/cdrskin.c
@@ -564,7 +564,8 @@ int Sfile_home_adr_s(char *filename, char *fileadr, int fa_size, int flag)
 #endif /* ! Cdrskin_extra_leaN */
 
 
-/* This would rather belong to libisofs */
+/* -------------------------- other misc functions ----------------------- */
+
 
 /* Learned from reading growisofs.c , 
    watching mkisofs, and viewing its results via od -c */
@@ -598,6 +599,30 @@ int Set_descr_iso_size(unsigned char data[2048], double size_in_bytes,
 }
 
 
+int Wait_for_input(int fd, int microsec, int flag)
+{
+ struct timeval wt;
+ fd_set rds,wts,exs;
+ int ready;
+
+ FD_ZERO(&rds);
+ FD_ZERO(&wts);
+ FD_ZERO(&exs);
+ FD_SET(fd,&rds); 
+ FD_SET(fd,&exs); 
+ wt.tv_sec=  microsec/1000000;
+ wt.tv_usec= microsec%1000000;
+ ready= select(fd+1,&rds,&wts,&exs,&wt);
+ if(ready<=0)
+   return(0);
+ if(FD_ISSET(fd,&exs))
+   return(-1);
+ if(FD_ISSET(fd,&rds))
+   return(1);
+ return(0);
+}
+
+
 /* --------------------------------------------------------------------- */
 
 /** Address translation table for users/applications which do not look
@@ -1564,20 +1589,12 @@ int Cdrtrack_get_sectors(struct CdrtracK *track, int flag)
 */
 int Cdrtrack_has_input_left(struct CdrtracK *track, int flag)
 {
- struct timeval wt;
- fd_set rds,wts,exs;
  int ready,ret;
  char buf[2];
 
  if(track->fifo_outlet_fd<=0)
    return(0);
- FD_ZERO(&rds);
- FD_ZERO(&wts);
- FD_ZERO(&exs);
- FD_SET(track->fifo_outlet_fd,&rds); 
- wt.tv_sec= 0;
- wt.tv_usec= 0;
- ready= select(track->fifo_outlet_fd+1,&rds,&wts,&exs,&wt);
+ ready= Wait_for_input(track->fifo_outlet_fd, 0, 0);
  if(ready<=0)
    return(0);
  ret= read(track->fifo_outlet_fd,buf,1);
@@ -1612,6 +1629,9 @@ struct CdrpreskiN {
  char queue_severity[81];
  char print_severity[81];
 
+ /** Wether to wait for available standard input data before touching drives */
+ int do_waiti;
+
  /** Stores eventually given absolute device address before translation */
  char raw_device_adr[Cdrskin_adrleN];
 
@@ -1719,6 +1739,7 @@ int Cdrpreskin_new(struct CdrpreskiN **preskin, int flag)
  o->verbosity= 0;
  strcpy(o->queue_severity,"NEVER");
  strcpy(o->print_severity,"SORRY");
+ o->do_waiti= 0;
  o->raw_device_adr[0]= 0;
  o->device_adr[0]= 0;
  o->adr_trn= NULL;
@@ -2445,6 +2466,8 @@ see_cdrskin_eng_html:;
      fprintf(stderr,
              "\t-multi\t\tgenerate a TOC that allows multi session\n");
 #endif
+     fprintf(stderr,
+           "\t-waiti\t\twait until input is available before opening SCSI\n");
      fprintf(stderr,
            "\t-immed\t\tTry to use the SCSI IMMED flag with certain long lasting commands\n");
      fprintf(stderr,
@@ -2547,6 +2570,10 @@ set_severities:;
      printf("Version timestamp :  %s\n",Cdrskin_timestamP);
      printf("Build timestamp   :  %s\n",Cdrskin_build_timestamP);
      {ret= 2; goto final_checks;}
+
+   } else if(strcmp(argv[i],"-waiti")==0) {
+     o->do_waiti= 1;
+
    }
 
  }
@@ -2555,6 +2582,18 @@ final_checks:;
  if(flag&1)
    goto ex;
 
+ if(o->do_waiti) {
+   fprintf(stderr,
+       "cdrskin: Option -waiti pauses program until input appears at stdin\n");
+   printf("Waiting for data on stdin...\n");
+   for(ret= 0; ret==0; )
+     ret= Wait_for_input(0,1000000,0);
+   if(ret<0 || feof(stdin))
+     fprintf(stderr,
+             "cdrskin: NOTE : stdin produces exception rather than data\n");
+   fprintf(stderr,"cdrskin: Option -waiti pausing is done.\n");
+ }
+
 #ifndef Cdrskin_libburn_no_burn_preset_device_opeN
  burn_preset_device_open(o->drive_exclusive
 #ifdef Cdrskin_libburn_preset_device_familY
@@ -6383,7 +6422,7 @@ int Cdrskin_setup(struct CdrskiN *skin, int argc, char **argv, int flag)
  static char ignored_full_options[][41]= {
    "-d", "-Verbose", "-V", "-silent", "-s", "-setdropts", "-prcap", 
    "-reset", "-abort", "-overburn", "-ignsize", "-useinfo",
-   "-fix", "-nofix", "-waiti",
+   "-fix", "-nofix",
    "-raw", "-raw96p", "-raw16",
    "-clone", "-text", "-mode2", "-xa", "-xa1", "-xa2", "-xamix",
    "-cdi", "-preemp", "-nopreemp", "-copy", "-nocopy",
@@ -7096,6 +7135,9 @@ track_too_large:;
              strcmp(argv[i],"-vvvv")==0) {
      /* is handled in Cdrpreskin_setup() */;
 
+   } else if(strcmp(argv[i],"-waiti")==0) {
+     /* is handled in Cdrpreskin_setup() */;
+
    } else if(strncmp(argv[i],"write_start_address=",20)==0) {
      skin->write_start_address= Scanf_io_size(argv[i]+20,0);
      if(skin->verbosity>=Cdrskin_verbose_cmD)
diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 2363b71..2f5f380 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2007.09.18.204043"
+#define Cdrskin_timestamP "2007.09.19.094046"