diff -Naur ../../CVSori/elks/arch/i86/Makefile ./arch/i86/Makefile
--- ../../CVSori/elks/arch/i86/Makefile	2004-05-31 15:49:25.000000000 +0200
+++ ./arch/i86/Makefile	2006-08-09 13:10:08.000000000 +0200
@@ -92,7 +92,7 @@
 	(cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
 		$(ARCH_DIR)/sibo/crt0.o $(ARCH_DIR)/sibo/crt1.o \
 		init/main.o $(ARCHIVES) $(DRIVERS) \
-		-t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+		-M -o $(ARCH_DIR)/boot/system > System.tmp ; \
 		sort -k4 System.tmp > System.map ; rm -f System.tmp ) 
 
 #SIBO image build
diff -Naur ../../CVSori/elks/arch/i86/config.in ./arch/i86/config.in
--- ../../CVSori/elks/arch/i86/config.in	2003-07-20 21:07:25.000000000 +0200
+++ ./arch/i86/config.in	2006-08-15 17:24:58.000000000 +0200
@@ -224,4 +224,5 @@
     bool 'Include kernel version system call'	CONFIG_SYS_VERSION	n
     bool 'Optimise for size rather than speed'	CONFIG_OPT_SMALL	n
     bool 'System Trace' 			CONFIG_STRACE		n
+    bool 'Debug on printk'			CONFIG_DEBUG		n
 endmenu
diff -Naur ../../CVSori/elks/arch/i86/drivers/char/KeyMaps/mkcfg ./arch/i86/drivers/char/KeyMaps/mkcfg
--- ../../CVSori/elks/arch/i86/drivers/char/KeyMaps/mkcfg	2002-04-25 00:03:53.000000000 +0200
+++ ./arch/i86/drivers/char/KeyMaps/mkcfg	2006-08-09 13:10:26.000000000 +0200
@@ -13,14 +13,14 @@
     printf '# Automatically created - do not edit.\n\n' >&3
     printf "choice 'XT Keyboard support'\t\t" >&3
     printf '/* Automatically created - do not edit */\n\n' >&4
-    while read FILE CODE NAME ; do
+    while read FILE CODE NAME ; do	
 	printf '\t\\\n\t%-12s\tCONFIG_KEYMAP_%s' >&3 \
 		"${SEP}${NAME}" "${CODE}"
 	SEP=' '
 	printf '#include "%s"\t\t/* %s\t%-9s\t*/\n' >&4 \
 		"${FILE}" "${CODE}" "${NAME}"
     done
-    printf '"\t\tAmerican\n\n# EOF.\n' >&3
+    printf '\"\n' >&3
 }
 
-codes | sort +1f | process 3> Config.in 4> keymaps.h
+codes | process 3> Config.in 4> keymaps.h
diff -Naur ../../CVSori/elks/arch/i86/drivers/char/ntty.c ./arch/i86/drivers/char/ntty.c
--- ../../CVSori/elks/arch/i86/drivers/char/ntty.c	2002-06-22 11:28:19.000000000 +0200
+++ ./arch/i86/drivers/char/ntty.c	2006-08-16 15:29:18.000000000 +0200
@@ -40,8 +40,12 @@
 
 #define MAX_TTYS NUM_TTYS
 struct tty ttys[MAX_TTYS];
+#ifdef CONFIG_CONSOLE_DIRECT
 extern struct tty_ops dircon_ops;
+#endif
+#ifdef CONFIG_CONSOLE_BIOS
 extern struct tty_ops bioscon_ops;
+#endif
 #ifdef CONFIG_CHAR_DEV_RS
 extern struct tty_ops rs_ops;
 #endif
diff -Naur ../../CVSori/elks/include/linuxmt/debug.h ./include/linuxmt/debug.h
--- ../../CVSori/elks/include/linuxmt/debug.h	2002-05-14 00:00:58.000000000 +0200
+++ ./include/linuxmt/debug.h	2006-08-15 19:59:03.000000000 +0200
@@ -36,7 +36,7 @@
  * parameters after the format string.
  */
 
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
 
 #define debug					printk
 #define debug1					printk