diff --git a/libemile/Makefile b/libemile/Makefile
index d3b5d1d..a6a3e0f 100644
--- a/libemile/Makefile
+++ b/libemile/Makefile
@@ -17,7 +17,7 @@ LIBRARY = libemile.a
 
 SOURCES = emile_block0_write.c emile_checksum.c emile_first_get_param.c \
 	  emile_first_set_param.c emile_first_set_param_scsi.c \
-	  emile_floppy_create_image.c emile_get_uncompressed_size.c \
+	  emile_floppy_create_image.c \
 	  emile_map_bootblock_get_type.c emile_map_bootblock_is_valid.c \
 	  emile_map_bootblock_read.c emile_map_bootblock_write.c \
 	  emile_map_close.c emile_map_dev.c emile_map_geometry.c \
@@ -35,11 +35,9 @@ SOURCES = emile_block0_write.c emile_checksum.c emile_first_get_param.c \
 	  emile_map_set_partition_name.c emile_map_set_partition_type.c \
 	  emile_map_set_startup.c emile_map_write.c \
 	  emile_scsi_create_container.c emile_scsi_get_dev.c \
-	  emile_scsi_get_rdev.c emile_second_get_buffer_size.c \
-	  emile_second_get_cmdline.c emile_second_get_kernel.c \
-	  emile_second_get_output.c emile_second_set_buffer_size.c \
-	  emile_second_set_cmdline.c emile_second_set_kernel.c \
-	  emile_second_set_kernel_scsi.c emile_second_set_output.c
+	  emile_scsi_get_rdev.c emile_second_get_configuration.c \
+	  emile_second_set_configuration.c emile_second_get_next_property.c \
+	  emile_second_get_property.c emile_second_set_property.c
 
 HEADERS = emile.h libemile.h partition.h bootblock.h
 
diff --git a/libemile/emile_second_get_kernel.c b/libemile/emile_second_get_kernel.c
deleted file mode 100644
index 9a6d87f..0000000
--- a/libemile/emile_second_get_kernel.c
+++ /dev/null
@@ -1,33 +0,0 @@
-static __attribute__((used)) char* rcsid = "$CVSHeader$";
-/*
- *
- * (c) 2004 Laurent Vivier <LaurentVivier@wanadoo.fr>
- *
- */
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "libemile.h"
-#include "emile.h"
-
-int emile_second_get_kernel(int fd, u_int32_t *kernel_offset,
-			    u_int32_t *kernel_image_size,
-			    u_int32_t *ramdisk_offset,
-			    u_int32_t *ramdisk_size)
-{
-	emile_l2_header_t header;
-	int ret;
-
-	ret = read(fd, &header, sizeof(header));
-	if (ret != sizeof(header))
-		return EEMILE_CANNOT_READ_SECOND;
-
-	*kernel_offset = read_long(&header.kernel_image_offset);
-	*kernel_image_size = read_long(&header.kernel_image_size);
-	*ramdisk_offset = read_long(&header.ramdisk_offset);
-	*ramdisk_size = read_long(&header.ramdisk_size);
-
-	return 0;
-}
diff --git a/libemile/libemile.h b/libemile/libemile.h
index af37027..2fff302 100644
--- a/libemile/libemile.h
+++ b/libemile/libemile.h
@@ -71,21 +71,6 @@ extern int emile_first_set_param(int fd, unsigned short tune_mask,
 extern int emile_first_get_param(int fd, int *drive_num, int *second_offset, 
 				 int *second_size);
 extern int emile_first_set_param_scsi(int fd, char *second_name);
-extern int emile_second_get_output(int fd, unsigned int *console_mask,
-				   unsigned int *bitrate0, int *datasize0,
-				   int *parity0, int *stopbits0,
-				   unsigned int *bitrate1, int *datasize1,
-				   int *parity1, int *stopbits1,
-				   int *gestaltid);
-extern int emile_second_set_output(int fd,
-				   unsigned int enable_mask, 
-				   unsigned int disable_mask,
-				   unsigned int bitrate0, int datasize0,
-				   int parity0, int stopbits0,
-				   unsigned int bitrate1, int datasize1,
-				   int parity1, int stopbits1, int gestaltid);
-extern int emile_second_set_cmdline(int fd, char* cmdline);
-extern int emile_second_get_cmdline(int fd, char* cmdline);
 extern int emile_second_set_kernel_scsi(int fd, char *kernel_name);
 extern int emile_floppy_create_image(char* first_level, char* second_level, 
 				     char* kernel_image, char* ramdisk, 
@@ -138,4 +123,7 @@ extern int emile_map_set_driver_number(emile_map_t *map, int number);
 extern int emile_block0_write(emile_map_t *map);
 extern char* emile_second_get_configuration(int fd);
 extern int emile_second_set_configuration(int fd, char *configuration);
+extern int emile_second_get_next_property(char *configuration, int index, char *name, char *property);
+extern int emile_second_get_property(char *configuration, char *name, char *property);
+extern void emile_second_set_property(char *configuration, char *name, char *property);
 #endif