diff --git a/kernel/trunk/core/syscall.inc b/kernel/trunk/core/syscall.inc
index 86c80e716f..02e8001687 100644
--- a/kernel/trunk/core/syscall.inc
+++ b/kernel/trunk/core/syscall.inc
@@ -168,7 +168,6 @@ iglobal
       dd sys_msg_board           ; 63-System message board
       dd 0
       dd syscall_putimage_palette; 65-PutImagePalette
-      dd sys_process_def         ; 66-Process definitions - keyboard
 
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; NEW SYSTEM FUNCTIONS TABLE ;;
@@ -242,7 +241,7 @@ iglobal
       dd cross_order             ; 63-System message board
       dd sys_resize_app_memory   ; 64-Resize application memory usage
       dd cross_order             ; 65-PutImagePalette
-      dd cross_order             ; 66-Process definitions - keyboard
+      dd sys_process_def         ; 66-Process definitions - keyboard
       dd syscall_move_window     ; 67-Window move or resize
       dd f68			 ; 68-Some internal services
       dd sys_debug_services      ; 69-Debug
diff --git a/kernel/trunk/docs/sysfuncr.txt b/kernel/trunk/docs/sysfuncr.txt
index e09c1c7a63..a29435d407 100644
--- a/kernel/trunk/docs/sysfuncr.txt
+++ b/kernel/trunk/docs/sysfuncr.txt
@@ -3459,6 +3459,7 @@ IPC 
 ======================================================================
 Режим ввода влияет на результаты чтения клавиш функцией 2.
 При загрузке программы для неё устанавливается ASCII-режим ввода.
+Если вызывается несуществующая подфункция возвращается в eax=-1.
 
 -------- Подфункция 1 - установить режим ввода с клавиатуры. ---------
 Параметры:
diff --git a/kernel/trunk/docs/sysfuncs.txt b/kernel/trunk/docs/sysfuncs.txt
index a93f32728d..8d226d1cf6 100644
--- a/kernel/trunk/docs/sysfuncs.txt
+++ b/kernel/trunk/docs/sysfuncs.txt
@@ -3421,6 +3421,7 @@ Remarks:
 ======================================================================
 The input mode influences results of reading keys by function 2.
 When a program loads, ASCII input mode is set for it.
+If subfunction is not support then eax=-1.
 
 -------------- Subfunction 1 - set keyboard input mode. --------------
 Parameters:
diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index dd98205201..f3ab9ad00b 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -4460,36 +4460,47 @@ end if
 .smbl2:
         ret
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 66 sys function.                                                ;;
+;; in eax=66,ebx in [0..5],ecx,edx                                 ;;
+;; out eax                                                         ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+iglobal
+align 4
+f66call:
+           dd sys_process_def.1   ; 1 = set keyboard mode
+           dd sys_process_def.2   ; 2 = get keyboard mode
+           dd sys_process_def.3   ; 3 = get keyboard ctrl, alt, shift
+           dd sys_process_def.4
+           dd sys_process_def.5
+endg
+
+
 
 
 sys_process_def:
+	dec	ebx
+	cmp	ebx,5
+	jae	.not_support	;if >=6 then or eax,-1
+
         mov     edi, [CURRENT_TASK]
+	jmp	dword [f66call+ebx*4]
 
-        dec     eax             ; 1 = set keyboard mode
-     jne   no_set_keyboard_setup
+.not_support:
+	or	eax,-1
+	ret
 
+.1:
      shl   edi,8
-     mov   [edi+SLOT_BASE + APPDATA.keyboard_mode],bl
+     mov   [edi+SLOT_BASE + APPDATA.keyboard_mode],cl
 
      ret
 
-   no_set_keyboard_setup:
-
-        dec     eax             ; 2 = get keyboard mode
-     jne   no_get_keyboard_setup
-
+.2:				; 2 = get keyboard mode
      shl   edi,8
      movzx eax, byte [SLOT_BASE+edi + APPDATA.keyboard_mode]
-
-     mov   [esp+36],eax
-
+     mov   [esp+32],eax
      ret
-
-   no_get_keyboard_setup:
-
-        dec     eax             ; 3 = get keyboard ctrl, alt, shift
-     jne   no_get_keyboard_cas
-
 ;     xor   eax,eax
 ;     movzx eax,byte [shift]
 ;     movzx ebx,byte [ctrl]
@@ -4498,20 +4509,14 @@ sys_process_def:
 ;     movzx ebx,byte [alt]
 ;     shl   ebx,3
 ;     add   eax,ebx
-
+.3:				;3 = get keyboard ctrl, alt, shift
  ;// mike.dld [
      mov   eax, [kb_state]
  ;// mike.dld ]
-
-     mov   [esp+36],eax
-
+     mov   [esp+32],eax
      ret
 
-   no_get_keyboard_cas:
-
-        dec     eax
-        jnz     no_add_keyboard_hotkey
-
+.4:
         mov     eax, hotkey_list
 @@:
         cmp     dword [eax+8], 0
@@ -4519,29 +4524,25 @@ sys_process_def:
         add     eax, 16
         cmp     eax, hotkey_list+16*256
         jb      @b
-        mov     dword [esp+36], 1
+        mov     dword [esp+32], 1
         ret
 .found_free:
         mov     [eax+8], edi
-        mov     [eax+4], ecx
-        movzx   ebx, bl
-        lea     ebx, [hotkey_scancodes+ebx*4]
-        mov     ecx, [ebx]
-        mov     [eax], ecx
-        mov     [ebx], eax
-        mov     [eax+12], ebx
+        mov     [eax+4], edx
+        movzx   ecx, cl
+        lea     ecx, [hotkey_scancodes+ecx*4]
+        mov     edx, [ecx]
+        mov     [eax], edx
+        mov     [ecx], eax
+        mov     [eax+12], ecx
         jecxz   @f
-        mov     [ecx+12], eax
+        mov     [edx+12], eax
 @@:
-        and     dword [esp+36], 0
+        and     dword [esp+32], 0
         ret
 
-no_add_keyboard_hotkey:
-
-        dec     eax
-        jnz     no_del_keyboard_hotkey
-
-        movzx   ebx, bl
+.5:
+        movzx   ebx, cl
         lea     ebx, [hotkey_scancodes+ebx*4]
         mov     eax, [ebx]
 .scan:
@@ -4549,13 +4550,13 @@ no_add_keyboard_hotkey:
         jz      .notfound
         cmp     [eax+8], edi
         jnz     .next
-        cmp     [eax+4], ecx
+        cmp     [eax+4], edx
         jz      .found
 .next:
         mov     eax, [eax]
         jmp     .scan
 .notfound:
-        mov     dword [esp+36], 1
+        mov     dword [esp+32], 1
         ret
 .found:
         mov     ecx, [eax]
@@ -4571,13 +4572,9 @@ no_add_keyboard_hotkey:
         mov     [eax+8], edx
         mov     [eax+12], edx
         mov     [eax], edx
-        mov     [esp+36], edx
+        mov     [esp+32], edx
         ret
 
-no_del_keyboard_hotkey:
-     ret
-
-
 align 4
 
 sys_gs:                         ; direct screen access