diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 63a1908..47c3889 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2010.02.17.141409"
+#define Cdrskin_timestamP "2010.02.22.134904"
diff --git a/libburn/init.c b/libburn/init.c
index cd57979..f3c35b4 100644
--- a/libburn/init.c
+++ b/libburn/init.c
@@ -417,10 +417,16 @@ int burn_builtin_abort_handler(void *handle, int signum, int flag)
 void burn_set_signal_handling(void *handle, burn_abort_handler_t handler,
 			     int mode)
 {
-	if(handler == NULL && mode == 0) {
+
+/*
+	fprintf(stderr, "libburn_experimental: burn_set_signal_handling, handler==%lx  mode=%d\n", (unsigned long) handler, mode);
+*/
+
+	if(handler == NULL) {
 		handler = burn_builtin_abort_handler;
 /*
-		fprintf(stderr, "libburn_experimental: activated burn_builtin_abort_handler() with handle '%s'\n",(handle==NULL ? "libburn : " : (char *) handle));
+		if ((mode & ~4) == 0)
+			fprintf(stderr, "libburn_experimental: activated burn_builtin_abort_handler() with handle '%s'\n",(handle==NULL ? "libburn : " : (char *) handle));
 */
 
 	}