diff --git a/kernel/trunk/build.bat b/kernel/trunk/build.bat
index e322d1e191..d94ebd06c6 100644
--- a/kernel/trunk/build.bat
+++ b/kernel/trunk/build.bat
@@ -1,7 +1,7 @@
 @echo off
 cls
 set languages=en ru ge et
-set drivers=sound sis infinity ensoniq ps2mouse com_mouse uart ati2d vmode
+set drivers=com_mouse emu10k1x ensoniq fm801 infinity sis sound uart viasound vmode vt823(x)
 set targets=all kernel drivers skins clean
 
 call :Check_Target %1
diff --git a/kernel/trunk/drivers/EMU10K1X.ASM b/kernel/trunk/drivers/emu10k1x.asm
similarity index 100%
rename from kernel/trunk/drivers/EMU10K1X.ASM
rename to kernel/trunk/drivers/emu10k1x.asm
diff --git a/kernel/trunk/drivers/imports.inc b/kernel/trunk/drivers/imports.inc
index 9edd1bd7ba..c1390a0f2f 100644
--- a/kernel/trunk/drivers/imports.inc
+++ b/kernel/trunk/drivers/imports.inc
@@ -27,9 +27,9 @@ kernel_export \
 	      ReservePortArea,\
 	      Boot_Log,\
 \
-          MutexInit,
-          MutexLock,
-          MutexUnlock,
+          MutexInit,\
+          MutexLock,\
+          MutexUnlock,\
 \
 	      PciApi,\
 	      PciRead32,\
diff --git a/kernel/trunk/drivers/VIASOUND.ASM b/kernel/trunk/drivers/viasound.asm
similarity index 100%
rename from kernel/trunk/drivers/VIASOUND.ASM
rename to kernel/trunk/drivers/viasound.asm
diff --git a/kernel/trunk/drivers/vt823(x).ASM b/kernel/trunk/drivers/vt823(x).asm
similarity index 100%
rename from kernel/trunk/drivers/vt823(x).ASM
rename to kernel/trunk/drivers/vt823(x).asm
diff --git a/kernel/trunk/make.sh b/kernel/trunk/make.sh
deleted file mode 100755
index 2be0433ec6..0000000000
--- a/kernel/trunk/make.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# This script does for linux the same as build.bat for DOS,
-# it compiles the KoOS kernel, hopefully ;-)
-
-CLANG=$1;
-
-# set debug=true to print executed bash commands
-debug=true
-
-outDir=bin
-outFileName=kernel.mnt
-outFile=$outDir/$outFileName
-
-usage()
-{
-   echo "Usage: make.sh [en|ru|ge|et]"
-   exit 1
-}
-
-compile()
-{
-   if [ -d "$outDir" ]; then
-      $debug && echo "rm -f $outFile"
-            rm -f $outFile
-   else
-      $debug && echo "mkdir $outDir"
-            mkdir $outDir
-   fi
-
-   $debug && echo "fasm -m 65536 kernel.asm $outFile"
-         fasm -m 65536 kernel.asm $outFile
-
-   $debug && echo "rm -f lang.inc"
-         rm -f lang.inc
-
-   $debug && echo "exit 0"
-         exit 0
-}
-
-if [ ! $CLANG ] ; then
-   usage
-fi
-
-for i in "en" "ru" "ge" "et"; do
-   if [ $i == $CLANG ] ; then
-      $debug && echo "echo \"lang fix \$i\" > lang.inc"
-            echo "lang fix $i" > lang.inc
-      compile
-   fi
-done
-usage
diff --git a/kernel/trunk/makefile b/kernel/trunk/makefile
index f2d916f767..29cb9cb5ed 100644
--- a/kernel/trunk/makefile
+++ b/kernel/trunk/makefile
@@ -1,7 +1,7 @@
 FASM=fasm
 FLAGS=-m 65536
 languages=en|ru|ge|et
-drivers_src=sound sis infinity uart ati2d vmode com_mouse
+drivers_src=com_mouse emu10k1x ensoniq fm801 infinity sis sound uart viasound vmode vt823\(x\)
 skins_src=default
 
 .PHONY: all kernel drivers skins clean
@@ -21,7 +21,7 @@ drivers:
 	@mkdir -p bin/drivers
 	@cd drivers; for f in $(drivers_src); do \
 	  echo "--- building 'bin/drivers/$${f}.obj' ..."; \
-	  $(FASM) $(FLAGS) $${f}.asm ../bin/drivers/$${f}.obj; \
+	  $(FASM) $(FLAGS) "$${f}.asm" "../bin/drivers/$${f}.obj" || exit $?; \
 	done
 	@mv bin/drivers/vmode.obj bin/drivers/vmode.mdr
 
@@ -30,7 +30,7 @@ skins:
 	@mkdir -p bin/skins
 	@cd skin; for f in $(skins_src); do \
 	  echo "--- building 'bin/skins/$${f}.skn' ..."; \
-	  $(FASM) $(FLAGS) $${f}.asm ../bin/skins/$${f}.skn; \
+	  $(FASM) $(FLAGS) $${f}.asm ../bin/skins/$${f}.skn || exit $?; \
 	done
 
 check_lang: