diff --git a/programs/system/setup/trunk/keymaps.inc b/programs/system/setup/trunk/keymaps.inc
index 87037fe8e4..9d29521cc0 100644
--- a/programs/system/setup/trunk/keymaps.inc
+++ b/programs/system/setup/trunk/keymaps.inc
@@ -232,7 +232,7 @@ be_keymap_shift:
 be_keymap_alt_gr:
 
      db   '6',27
-     db   28,'|@#',0,'^',0,0,'{}',0,0,8,9
+     db   '|@#',0,0,'^',0,0,'{}',0,0,8,9
      db   'azertyuiop[]',13
      db   '~qsdfghjklm´`\',0,'wxcvbn',0,0,0,'~',0,'45 '
      db   '@234567890123',180,178,184,'6',176,'7'
@@ -240,4 +240,44 @@ be_keymap_alt_gr:
      db   'AB<D',255,'FGHIJKLMNOPQRSTUVWXYZ'
      db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
      db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
\ No newline at end of file
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     
+it_keymap:
+  
+     db   '6',27
+     db   '1234567890',39,0,8,9
+     db   'qwertyuiop',0,'+',13
+     db   '~asdfghjkl',0,0,0,0,'<zxcvbnm,.-',0,'45 '
+     db   '@234567890123',180,178,184,'6',176,'7'
+     db   179,'8',181,177,183,185,182
+     db   'AB<D',255,'FGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     
+it_keymap_shift:
+
+     db   '6',27
+     db   '!"',0,'$%&/()=?^',8,9
+     db   'QWERTYUIOP',0,'*',13
+     db   '~ASDFGHJKL',0,0,0,0,'>ZXCVBNM;:_',0,'45 '
+     db   '@234567890123',180,178,184,'6',176,'7'
+     db   179,'8',181,177,183,185,182
+     db   'AB>D',255,'FGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     
+it_keymap_alt_gr:
+
+     db   '6',27
+     db   172,185,178,179,188,189,172,'{[]}',96,'~',8,9
+     db   'qwertyuiop[]',13
+     db   '~asdfghjkl@#',0,'<zxcvbnm;:_',0,'45 '
+     db   '@234567890123',180,178,184,'6',176,'7'
+     db   179,'8',181,177,183,185,182
+     db   'AB<D',255,'FGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+     
\ No newline at end of file
diff --git a/programs/system/setup/trunk/setup.asm b/programs/system/setup/trunk/setup.asm
index 5c5fde4a3d..289ebfeef3 100644
--- a/programs/system/setup/trunk/setup.asm
+++ b/programs/system/setup/trunk/setup.asm
@@ -172,7 +172,7 @@ no_close:
         jmp     nodownup
 ;--------------------------------------
 downuplbl:
-        mov     eax,6
+        mov     eax,7
 ;--------------------------------------
 nodownup:
         mov     [keyboard],eax
@@ -182,7 +182,7 @@ nokm:
         cmp     ah,5
         jnz     nokp
         mov     eax,[keyboard]
-        cmp     eax,6
+        cmp     eax,7
         je      updownlbl
         inc     eax
         jmp     noupdown
@@ -428,7 +428,7 @@ nosetkeylfr:
 ;--------------------------------------
 nosetkeylet:
         cmp     [keyboard],6    ;belgian
-        jnz     nosetkeylbe
+        jnz     nosetkeylit
 
         mcall   21,2,1,be_keymap
         
@@ -438,8 +438,23 @@ nosetkeylet:
         inc  ecx
         mcall   21,,,be_keymap_alt_gr
 
-        mcall   21,,9,5
+        mcall   21,,9,7
 ;--------------------------------------
+nosetkeylit:
+        cmp     [keyboard],7    ;italian
+        jnz     nosetkeylbe
+        
+        mcall   21,2,1,it_keymap
+        
+        inc     ecx
+        mcall   21,,,it_keymap_shift
+        
+        inc     ecx
+        mcall   21,,,it_keymap_alt_gr
+        
+        mcall   21,,9,8
+;--------------------------------------
+
 nosetkeylbe:
         ret
 ;-------------------------------------------------------------------------------
@@ -566,6 +581,12 @@ noet:
         mov     [text00+LLL*1+32],dword 'IAN '
 ;--------------------------------------
 nobe:
+        cmp     eax,7
+        jnz     noit
+        mov     [text00+LLL*1+28],dword 'ITAL'
+        mov     [text00+LLL*1+32],dword 'IAN'
+;--------------------------------------
+noit:
         mov     eax,[syslang]             ; SYSTEM LANGUAGE
         dec     eax
         test    eax,eax