diff --git a/Makefile.am b/Makefile.am
index 1447e8e..75193db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,6 @@ libburn_libburn_la_SOURCES = \
 	libburn/libburn.h \
 	libburn/libdax_msgs.h \
 	libburn/libdax_msgs.c \
-	libburn/message.c \
-	libburn/message.h \
 	libburn/mmc.c \
 	libburn/mmc.h \
 	libburn/null.c \
@@ -59,6 +57,11 @@ libburn_libburn_la_SOURCES = \
 	libburn/write.h \
 	version.h
 
+## ts A60924 : Obsoleted
+##	libburn/message.c \
+##	libburn/message.h \
+
+
 libisofs_libisofs_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 libisofs_libisofs_la_SOURCES = \
diff --git a/libburn/drive.c b/libburn/drive.c
index 40c63a1..fec503b 100644
--- a/libburn/drive.c
+++ b/libburn/drive.c
@@ -296,7 +296,9 @@ void burn_wait_all(void)
 
 void burn_disc_erase_sync(struct burn_drive *d, int fast)
 {
+/* ts A60924 : libburn/message.c gets obsoleted
 	burn_message_clear_queue();
+*/
 
 	burn_print(1, "erasing drive %s %s\n", d->idata->vendor,
 		   d->idata->product);
diff --git a/libburn/libburn.h b/libburn/libburn.h
index d18c9fd..147c62b 100644
--- a/libburn/libburn.h
+++ b/libburn/libburn.h
@@ -175,6 +175,10 @@ enum burn_disc_status
 	BURN_DISC_FULL
 };
 
+
+/* ts A60924 : libburn/message.c gets obsoleted */
+#ifdef BURN_WITH_OBSOLETED_MESSAGE_C
+
 /** Possible types of messages form the library. */
 enum burn_message_type
 {
@@ -206,6 +210,9 @@ enum burn_message_error
 	BURN_ERROR_CANCELLED
 };
 
+#endif /* BURN_WITH_OBSOLETED_MESSAGE_C */
+
+
 /** Possible data source return values */
 enum burn_source_status
 {
@@ -378,6 +385,10 @@ struct burn_drive_info
 	struct burn_drive *drive;
 };
 
+
+/* ts A60924 : libburn/message.c gets obsoleted */
+#ifdef BURN_WITH_OBSOLETED_MESSAGE_C
+
 /** Messages from the library */
 struct burn_message
 {
@@ -402,6 +413,10 @@ struct burn_message
 	} detail;
 };
 
+#endif /* BURN_WITH_OBSOLETED_MESSAGE_C */
+
+
+
 /** Operation progress report. All values are 0 based indices. 
  * */
 struct burn_progress {
@@ -470,6 +485,9 @@ void burn_set_verbosity(int level);
 */
 void burn_preset_device_open(int exclusive, int blocking, int abort_on_busy);
 
+/* ts A60924 : libburn/message.c gets obsoleted */
+#ifdef BURN_WITH_OBSOLETED_MESSAGE_C
+
 /** Returns a newly allocated burn_message structure. This message should be
     freed with burn_message_free() when you are finished with it.
     @return A message or NULL when there are no more messages to retrieve.
@@ -479,6 +497,8 @@ struct burn_message* burn_get_message(void);
 /** Frees a burn_message structure */
 void burn_message_free(struct burn_message *msg);
 
+#endif /* BURN_WITH_OBSOLETED_MESSAGE_C */
+
 
 /* ts A60823 */
 /** Aquire a drive with known persistent address.This is the sysadmin friendly
diff --git a/libburn/write.c b/libburn/write.c
index 9bd88e3..ec4e56f 100644
--- a/libburn/write.c
+++ b/libburn/write.c
@@ -448,7 +448,9 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 	int first = 1, i;
 	int res;
 
+/* ts A60924 : libburn/message.c gets obsoleted
 	burn_message_clear_queue();
+*/
 
 	burn_print(1, "sync write of %d sessions\n", disc->sessions);
 	d->buffer = &buf;