diff --git a/src/apps/bin/keymap/Jamfile b/src/apps/bin/keymap/Jamfile
new file mode 100644
index 0000000000..954af65e45
--- /dev/null
+++ b/src/apps/bin/keymap/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src apps bin keymap ;
+
+BinCommand keymap :
+	key_map.cpp
+	Keymap.cpp
+	: be ;
diff --git a/src/apps/bin/keymap/Keymap.cpp b/src/apps/bin/keymap/Keymap.cpp
new file mode 100644
index 0000000000..9bbb49477d
--- /dev/null
+++ b/src/apps/bin/keymap/Keymap.cpp
@@ -0,0 +1,546 @@
+// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+//
+//	Copyright (c) 2004, Haiku
+//
+//  This software is part of the Haiku distribution and is covered 
+//  by the Haiku license.
+//
+//
+//  File:        Keymap.cpp
+//  Author:      Jérôme Duval
+//  Description: keymap bin
+//  Created :    July 29, 2004
+// 
+// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+
+#include "Keymap.h"
+#include <stdio.h>
+#include <string.h>
+#include <ByteOrder.h>
+#include <File.h>
+
+void 
+Keymap::GetKey( char *chars, int32 offset, char* string) 
+{
+	int size = chars[offset++];
+	char str[32];
+	memset(str, 0, 32);
+	memset(string, 0, 32);
+	
+	switch( size ) {
+	case 0:
+		// Not mapped 
+		sprintf(str, "''");
+		break; 
+	
+	case 1:
+		// 1-byte UTF-8/ASCII character
+		if ((uint8)chars[offset] < 0x20
+			|| (uint8)chars[offset] > 0x7e)
+			sprintf(str, "0x%02x", (uint8)chars[offset]);
+		else
+			sprintf(str, "'%s%c'", 
+				(chars[offset] == '\\' || chars[offset] == '\'') ? "\\" : "", chars[offset]);
+		break; 
+	
+	default:
+		// n-byte UTF-8/ASCII character
+		sprintf(str, "0x");
+		for (int i=0; i<size; i++)
+			sprintf(str + 2*(i+1), "%02x", (uint8)chars[offset+i]);
+		break;
+	}
+	strncpy(string, str, (strlen(str) < 12) ? strlen(str) : 12);
+}
+
+
+void
+Keymap::Dump()
+{
+	printf(
+"#!/bin/keymap -l\n"
+"#\n"
+"#\tRaw key numbering for 101 keyboard...\n"
+"#                                                                                        [sys]       [brk]\n"
+"#                                                                                         0x7e        0x7f\n"
+"# [esc]       [ f1] [ f2] [ f3] [ f4] [ f5] [ f6] [ f7] [ f8] [ f9] [f10] [f11] [f12]    [prn] [scr] [pau]\n"
+"#  0x01        0x02  0x03  0x04  0x05  0x06  0x07  0x08  0x09  0x0a  0x0b  0x0c  0x0d     0x0e  0x0f  0x10     K E Y P A D   K E Y S\n"
+"#\n"
+"# [ ` ] [ 1 ] [ 2 ] [ 3 ] [ 4 ] [ 5 ] [ 6 ] [ 7 ] [ 8 ] [ 9 ] [ 0 ] [ - ] [ = ] [bck]    [ins] [hme] [pup]    [num] [ / ] [ * ] [ - ]\n"
+"#  0x11  0x12  0x13  0x14  0x15  0x16  0x17  0x18  0x19  0x1a  0x1b  0x1c  0x1d  0x1e     0x1f  0x20  0x21     0x22  0x23  0x24  0x25\n"
+"#\n"
+"# [tab] [ q ] [ w ] [ e ] [ r ] [ t ] [ y ] [ u ] [ i ] [ o ] [ p ] [ [ ] [ ] ] [ \\ ]    [del] [end] [pdn]    [ 7 ] [ 8 ] [ 9 ] [ + ]\n"
+"#  0x26  0x27  0x28  0x29  0x2a  0x2b  0x2c  0x2d  0x2e  0x2f  0x30  0x31  0x32  0x33     0x34  0x35  0x36     0x37  0x38  0x39  0x3a\n"
+"#\n"
+"# [cap] [ a ] [ s ] [ d ] [ f ] [ g ] [ h ] [ j ] [ k ] [ l ] [ ; ] [ ' ] [  enter  ]                         [ 4 ] [ 5 ] [ 6 ]\n"
+"#  0x3b  0x3c  0x3d  0x3e  0x3f  0x40  0x41  0x42  0x43  0x44  0x45  0x46     0x47                             0x48  0x49  0x4a\n"
+"#\n"
+"# [shift]     [ z ] [ x ] [ c ] [ v ] [ b ] [ n ] [ m ] [ , ] [ . ] [ / ]     [shift]          [ up]          [ 1 ] [ 2 ] [ 3 ] [ent]\n"
+"#   0x4b       0x4c  0x4d  0x4e  0x4f  0x50  0x51  0x52  0x53  0x54  0x55       0x56            0x57           0x58  0x59  0x5a  0x5b\n"
+"#\n"
+"# [ctr]             [cmd]             [  space  ]             [cmd]             [ctr]    [lft] [dwn] [rgt]    [ 0 ] [ . ]\n"
+"#  0x5c              0x5d                 0x5e                 0x5f              0x60     0x61  0x62  0x63     0x64  0x65\n"
+"#\n"
+"#\tNOTE: On a Microsoft Natural Keyboard:\n"
+"#\t\t\tleft option  = 0x66\n"
+"#\t\t\tright option = 0x67\n"
+"#\t\t\tmenu key     = 0x68\n"
+"#\tNOTE: On an Apple Extended Keyboard:\n"
+"#\t\t\tleft option  = 0x66\n"
+"#\t\t\tright option = 0x67\n"
+"#\t\t\tkeypad '='   = 0x6a\n"
+"#\t\t\tpower key    = 0x6b\n");
+
+	printf("Version = %ld\n", fKeys.version);
+	printf("CapsLock = 0x%02lx\n", fKeys.caps_key);
+	printf("ScrollLock = 0x%02lx\n", fKeys.scroll_key);
+	printf("NumLock = 0x%02lx\n", fKeys.num_key);
+	printf("LShift = 0x%02lx\n", fKeys.left_shift_key);
+	printf("RShift = 0x%02lx\n", fKeys.right_shift_key);
+	printf("LCommand = 0x%02lx\n", fKeys.left_command_key);
+	printf("RCommand = 0x%02lx\n", fKeys.right_command_key);
+	printf("LControl = 0x%02lx\n", fKeys.left_control_key);
+	printf("RControl = 0x%02lx\n", fKeys.right_control_key);
+	printf("LOption = 0x%02lx\n", fKeys.left_option_key);
+	printf("ROption = 0x%02lx\n", fKeys.right_option_key);
+	printf("Menu = 0x%02lx\n", fKeys.menu_key);
+	printf(
+"#\n"
+"# Lock settings\n"
+"# To set NumLock, do the following:\n"
+"#   LockSettings = NumLock\n"
+"#\n"
+"# To set everything, do the following:\n"
+"#   LockSettings = CapsLock NumLock ScrollLock\n"
+"#\n");
+	printf("LockSettings = ");
+	if (fKeys.lock_settings & B_CAPS_LOCK)
+		printf("CapsLock ");
+	if (fKeys.lock_settings & B_NUM_LOCK)
+		printf("NumLock ");
+	if (fKeys.lock_settings & B_SCROLL_LOCK)
+		printf("ScrollLock ");
+	printf("\n");
+	printf(
+"# Legend:\n"
+"#   n = Normal\n"
+"#   s = Shift\n"
+"#   c = Control\n"
+"#   C = CapsLock\n"
+"#   o = Option\n"
+"# Key      n        s        c        o        os       C        Cs       Co       Cos     \n");
+	
+	for( int idx = 0; idx < 128; idx++ ) {
+		char normalKey[32];
+		char shiftKey[32];
+		char controlKey[32];
+		char optionKey[32];
+		char optionShiftKey[32];
+		char capsKey[32];
+		char capsShiftKey[32];
+		char optionCapsKey[32];
+		char optionCapsShiftKey[32];
+		
+		GetKey( fChars, fKeys.normal_map[idx], normalKey);
+		GetKey( fChars, fKeys.shift_map[idx], shiftKey); 
+		GetKey( fChars, fKeys.control_map[idx], controlKey); 
+		GetKey( fChars, fKeys.option_map[idx], optionKey); 
+		GetKey( fChars, fKeys.option_shift_map[idx], optionShiftKey); 
+		GetKey( fChars, fKeys.caps_map[idx], capsKey); 
+		GetKey( fChars, fKeys.caps_shift_map[idx], capsShiftKey); 
+		GetKey( fChars, fKeys.option_caps_map[idx], optionCapsKey); 
+		GetKey( fChars, fKeys.option_caps_shift_map[idx], optionCapsShiftKey);
+		
+		printf("Key 0x%02x = %-9s%-9s%-9s%-9s%-9s%-9s%-9s%-9s%-9s\n", idx, normalKey, shiftKey, controlKey,
+			optionKey, optionShiftKey, capsKey, capsShiftKey, optionCapsKey, optionCapsShiftKey); 
+	}
+	
+	int32* deadOffsets[] = {
+		fKeys.acute_dead_key,
+		fKeys.grave_dead_key,
+		fKeys.circumflex_dead_key,
+		fKeys.dieresis_dead_key,
+		fKeys.tilde_dead_key
+	};
+	
+	char labels[][12] = {
+		"Acute",
+		"Grave",
+		"Circumflex",
+		"Diaeresis",
+		"Tilde"
+	};
+	
+	uint32 deadTables[] = {
+		fKeys.acute_tables,
+		fKeys.grave_tables,
+		fKeys.circumflex_tables,
+		fKeys.dieresis_tables,
+		fKeys.tilde_tables
+	};
+	
+	for (int i = 0; i<5; i++) {
+		for (int idx = 0; idx < 32; idx++ ) {
+			char deadKey[32];
+			char secondKey[32];
+			GetKey( fChars, deadOffsets[i][idx++], deadKey);
+			GetKey( fChars, deadOffsets[i][idx], secondKey); 
+			printf("%s %-9s = %-9s\n", labels[i], deadKey, secondKey);
+		}
+		
+		printf("%sTab = ", labels[i]);
+		
+		if (deadTables[i] & B_NORMAL_TABLE)
+			printf("Normal ");
+		if (deadTables[i] & B_SHIFT_TABLE)
+			printf("Shift ");
+		if (deadTables[i] & B_CONTROL_TABLE)
+			printf("Control ");
+		if (deadTables[i] & B_OPTION_TABLE)
+			printf("Option ");
+		if (deadTables[i] & B_OPTION_SHIFT_TABLE)
+			printf("Option-Shift ");
+		if (deadTables[i] & B_CAPS_TABLE)
+			printf("CapsLock ");
+		if (deadTables[i] & B_CAPS_SHIFT_TABLE)
+			printf("CapsLock-Shift ");
+		if (deadTables[i] & B_OPTION_CAPS_TABLE)
+			printf("CapsLock-Option ");
+		if (deadTables[i] & B_OPTION_CAPS_SHIFT_TABLE)
+			printf("CapsLock-Option-Shift ");
+		printf("\n");
+	}
+
+}
+
+
+void
+Keymap::LoadCurrent()
+{
+	key_map *keys;
+	get_key_map(&keys, &fChars);
+	memcpy(&fKeys, keys, sizeof(fKeys));
+	delete keys;
+}
+
+/*
+	file format in big endian :
+	struct key_map	
+	uint32 size of following charset
+	charset (offsets go into this with size of character followed by character)
+*/
+// we load a map from a file
+status_t 
+Keymap::Load(entry_ref &ref)
+{
+	status_t err;
+	
+	BFile file(&ref, B_READ_ONLY);
+	if ((err = file.InitCheck()) != B_OK) {
+		printf("error %s\n", strerror(err));
+		return err;
+	}
+	
+	if (file.Read(&fKeys, sizeof(fKeys)) < (ssize_t)sizeof(fKeys)) {
+		return B_BAD_VALUE;
+	}
+	
+	for (uint32 i=0; i<sizeof(fKeys)/4; i++)
+		((uint32*)&fKeys)[i] = B_BENDIAN_TO_HOST_INT32(((uint32*)&fKeys)[i]);
+	
+	if (file.Read(&fCharsSize, sizeof(uint32)) < (ssize_t)sizeof(uint32)) {
+		return B_BAD_VALUE;
+	}
+	
+	fCharsSize = B_BENDIAN_TO_HOST_INT32(fCharsSize);
+	if (!fChars)
+		delete[] fChars;
+	fChars = new char[fCharsSize];
+	err = file.Read(fChars, fCharsSize);
+	
+	return B_OK;
+}
+
+
+// we save a map from a file
+status_t 
+Keymap::Save(entry_ref &ref)
+{
+	status_t err;
+	
+	BFile file(&ref, B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE );
+	if ((err = file.InitCheck()) != B_OK) {
+		printf("error %s\n", strerror(err));
+		return err;
+	}
+	
+	for (uint32 i=0; i<sizeof(fKeys)/4; i++)
+		((uint32*)&fKeys)[i] = B_HOST_TO_BENDIAN_INT32(((uint32*)&fKeys)[i]);
+		
+	if ((err = file.Write(&fKeys, sizeof(fKeys))) < (ssize_t)sizeof(fKeys)) {
+		return err;
+	}
+	
+	for (uint32 i=0; i<sizeof(fKeys)/4; i++)
+		((uint32*)&fKeys)[i] = B_BENDIAN_TO_HOST_INT32(((uint32*)&fKeys)[i]);
+	
+	fCharsSize = B_HOST_TO_BENDIAN_INT32(fCharsSize);
+	
+	if ((err = file.Write(&fCharsSize, sizeof(uint32))) < (ssize_t)sizeof(uint32)) {
+		return B_BAD_VALUE;
+	}
+	
+	fCharsSize = B_BENDIAN_TO_HOST_INT32(fCharsSize);
+	
+	if ((err = file.Write(fChars, fCharsSize)) < (ssize_t)fCharsSize)
+		return err;
+	
+	return B_OK;
+}
+
+
+/* we need to know if a key is a modifier key to choose 
+	a valid key when several are pressed together
+*/
+bool 
+Keymap::IsModifierKey(uint32 keyCode)
+{
+	if ((keyCode == fKeys.caps_key)
+		|| (keyCode == fKeys.num_key)
+		|| (keyCode == fKeys.left_shift_key)
+		|| (keyCode == fKeys.right_shift_key)
+		|| (keyCode == fKeys.left_command_key)
+		|| (keyCode == fKeys.right_command_key)
+		|| (keyCode == fKeys.left_control_key)
+		|| (keyCode == fKeys.right_control_key)
+		|| (keyCode == fKeys.left_option_key)
+		|| (keyCode == fKeys.right_option_key)
+		|| (keyCode == fKeys.menu_key))
+			return true;
+	return false;
+}
+
+
+// tell if a key is a dead key, needed for draw a dead key
+uint8
+Keymap::IsDeadKey(uint32 keyCode, uint32 modifiers)
+{
+	int32 offset;
+	uint32 tableMask = 0;
+	
+	switch (modifiers & 0xcf) {
+		case B_SHIFT_KEY: offset = fKeys.shift_map[keyCode]; tableMask = B_SHIFT_TABLE; break;
+		case B_CAPS_LOCK: offset = fKeys.caps_map[keyCode]; tableMask = B_CAPS_TABLE; break;
+		case B_CAPS_LOCK|B_SHIFT_KEY: offset = fKeys.caps_shift_map[keyCode]; tableMask = B_CAPS_SHIFT_TABLE; break;
+		case B_OPTION_KEY: offset = fKeys.option_map[keyCode]; tableMask = B_OPTION_TABLE; break;
+		case B_OPTION_KEY|B_SHIFT_KEY: offset = fKeys.option_shift_map[keyCode]; tableMask = B_OPTION_SHIFT_TABLE; break;
+		case B_OPTION_KEY|B_CAPS_LOCK: offset = fKeys.option_caps_map[keyCode]; tableMask = B_OPTION_CAPS_TABLE; break;
+		case B_OPTION_KEY|B_SHIFT_KEY|B_CAPS_LOCK: offset = fKeys.option_caps_shift_map[keyCode]; tableMask = B_OPTION_CAPS_SHIFT_TABLE; break;
+		case B_CONTROL_KEY: offset = fKeys.control_map[keyCode]; tableMask = B_CONTROL_TABLE; break;
+		default: offset = fKeys.normal_map[keyCode]; tableMask = B_NORMAL_TABLE; break;
+	}
+	
+	if (offset<=0)
+		return 0;	
+	uint32 numBytes = fChars[offset];
+	
+	if (!numBytes)
+		return 0;
+		
+	char chars[4];	
+	strncpy(chars, &(fChars[offset+1]), numBytes );
+	chars[numBytes] = 0; 
+	
+	int32 deadOffsets[] = {
+		fKeys.acute_dead_key[1],
+		fKeys.grave_dead_key[1],
+		fKeys.circumflex_dead_key[1],
+		fKeys.dieresis_dead_key[1],
+		fKeys.tilde_dead_key[1]
+	}; 
+	
+	uint32 deadTables[] = {
+		fKeys.acute_tables,
+		fKeys.grave_tables,
+		fKeys.circumflex_tables,
+		fKeys.dieresis_tables,
+		fKeys.tilde_tables
+	};
+	
+	for (int32 i=0; i<5; i++) {
+		if ((deadTables[i] & tableMask) == 0)
+			continue;
+		
+		if (offset == deadOffsets[i])
+			return i+1;
+			
+		uint32 deadNumBytes = fChars[deadOffsets[i]];
+		
+		if (!deadNumBytes)
+			continue;
+			
+		if (strncmp(chars, &(fChars[deadOffsets[i]+1]), deadNumBytes ) == 0) {
+			return i+1;
+		}
+	}
+	return 0;
+}
+
+
+// tell if a key is a dead second key, needed for draw a dead second key
+bool
+Keymap::IsDeadSecondKey(uint32 keyCode, uint32 modifiers, uint8 activeDeadKey)
+{
+	if (!activeDeadKey)
+		return false;
+	
+	int32 offset;
+	
+	switch (modifiers & 0xcf) {
+		case B_SHIFT_KEY: offset = fKeys.shift_map[keyCode]; break;
+		case B_CAPS_LOCK: offset = fKeys.caps_map[keyCode]; break;
+		case B_CAPS_LOCK|B_SHIFT_KEY: offset = fKeys.caps_shift_map[keyCode]; break;
+		case B_OPTION_KEY: offset = fKeys.option_map[keyCode]; break;
+		case B_OPTION_KEY|B_SHIFT_KEY: offset = fKeys.option_shift_map[keyCode]; break;
+		case B_OPTION_KEY|B_CAPS_LOCK: offset = fKeys.option_caps_map[keyCode]; break;
+		case B_OPTION_KEY|B_SHIFT_KEY|B_CAPS_LOCK: offset = fKeys.option_caps_shift_map[keyCode]; break;
+		case B_CONTROL_KEY: offset = fKeys.control_map[keyCode]; break;
+		default: offset = fKeys.normal_map[keyCode]; break;
+	}
+	
+	uint32 numBytes = fChars[offset];
+	
+	if (!numBytes)
+		return false;
+	
+	int32* deadOffsets[] = {
+		fKeys.acute_dead_key,
+		fKeys.grave_dead_key,
+		fKeys.circumflex_dead_key,
+		fKeys.dieresis_dead_key,
+		fKeys.tilde_dead_key
+	};
+	
+	int32 *deadOffset = deadOffsets[activeDeadKey-1]; 
+	
+	for (int32 i=0; i<32; i++) {
+		if (offset == deadOffset[i])
+			return true;
+			
+		uint32 deadNumBytes = fChars[deadOffset[i]];
+		
+		if (!deadNumBytes)
+			continue;
+			
+		if (strncmp(&(fChars[offset+1]), &(fChars[deadOffset[i]+1]), deadNumBytes ) == 0)
+			return true;
+		i++;
+	}
+	return false;
+}
+
+
+// get the char for a key given modifiers and active dead key
+void
+Keymap::GetChars(uint32 keyCode, uint32 modifiers, uint8 activeDeadKey, char** chars, int32* numBytes)
+{
+	int32 offset;
+	
+	*numBytes = 0;
+	*chars = NULL;
+	
+	// here we take NUMLOCK into account
+	if (modifiers & B_NUM_LOCK)
+		switch (keyCode) {
+			case 0x37:
+			case 0x38:
+			case 0x39:
+			case 0x48:
+			case 0x49:
+			case 0x4a:
+			case 0x58:
+			case 0x59:
+			case 0x5a:
+			case 0x64:
+			case 0x65:
+				modifiers ^= B_SHIFT_KEY;
+		}	
+
+	// here we choose the right map given the modifiers
+	switch (modifiers & 0xcf) {
+		case B_SHIFT_KEY: offset = fKeys.shift_map[keyCode]; break;
+		case B_CAPS_LOCK: offset = fKeys.caps_map[keyCode]; break;
+		case B_CAPS_LOCK|B_SHIFT_KEY: offset = fKeys.caps_shift_map[keyCode]; break;
+		case B_OPTION_KEY: offset = fKeys.option_map[keyCode]; break;
+		case B_OPTION_KEY|B_SHIFT_KEY: offset = fKeys.option_shift_map[keyCode]; break;
+		case B_OPTION_KEY|B_CAPS_LOCK: offset = fKeys.option_caps_map[keyCode]; break;
+		case B_OPTION_KEY|B_SHIFT_KEY|B_CAPS_LOCK: offset = fKeys.option_caps_shift_map[keyCode]; break;
+		case B_CONTROL_KEY: offset = fKeys.control_map[keyCode]; break;
+		default: offset = fKeys.normal_map[keyCode]; break;
+	}
+	
+	// here we get the char size
+	*numBytes = fChars[offset];
+	
+	if (!*numBytes)
+		return;
+	
+	// here we take an potential active dead key
+	int32 *dead_key;
+	switch(activeDeadKey) {
+		case 1: dead_key = fKeys.acute_dead_key; break;
+		case 2: dead_key = fKeys.grave_dead_key; break;
+		case 3: dead_key = fKeys.circumflex_dead_key; break;
+		case 4: dead_key = fKeys.dieresis_dead_key; break;
+		case 5: dead_key = fKeys.tilde_dead_key; break;
+		default: 
+		{
+			// if not dead, we copy and return the char
+			char *str = *chars = new char[*numBytes + 1]; 
+			strncpy(str, &(fChars[offset+1]), *numBytes );
+			str[*numBytes] = 0;
+			return;
+		}
+	}
+
+	// if dead key, we search for our current offset char in the dead key offset table
+	// string comparison is needed
+	for (int32 i=0; i<32; i++) {
+		if (strncmp(&(fChars[offset+1]), &(fChars[dead_key[i]+1]), *numBytes ) == 0) {
+			*numBytes = fChars[dead_key[i+1]];
+		
+			switch( *numBytes ) {
+				case 0:
+					// Not mapped
+					*chars = NULL; 
+					break; 
+				default:
+					// 1-, 2-, 3-, or 4-byte UTF-8 character 
+				{ 
+					char *str = *chars = new char[*numBytes + 1]; 
+					strncpy(str, &fChars[dead_key[i+1]+1], *numBytes );
+					str[*numBytes] = 0; 
+				} 
+					break; 
+			}
+			return;
+		}		
+		i++;
+	}
+
+	// if not found we return the current char mapped	
+	*chars = new char[*numBytes + 1];
+	strncpy(*chars, &(fChars[offset+1]), *numBytes );
+	(*chars)[*numBytes] = 0; 	
+	
+}
+
+status_t _restore_key_map_();
+
+
+// we make our input server use the map in /boot/home/config/settings/Keymap
+status_t
+Keymap::Use()
+{
+	return _restore_key_map_();
+}
diff --git a/src/apps/bin/keymap/Keymap.h b/src/apps/bin/keymap/Keymap.h
new file mode 100644
index 0000000000..71c3e8a8ac
--- /dev/null
+++ b/src/apps/bin/keymap/Keymap.h
@@ -0,0 +1,43 @@
+// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+//
+//	Copyright (c) 2004, Haiku
+//
+//  This software is part of the Haiku distribution and is covered 
+//  by the Haiku license.
+//
+//
+//  File:        Keymap.h
+//  Author:      Jérôme Duval
+//  Description: keymap bin
+//  Created :    July 30, 2004
+// 
+// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+
+#ifndef KEYMAP_H
+#define KEYMAP_H
+
+#include <InterfaceDefs.h>
+#include <Entry.h>
+
+class Keymap 
+{
+public:
+	void LoadCurrent();
+	status_t Load(entry_ref &ref);
+	status_t Save(entry_ref &ref);
+	//status_t LoadSource(entry_ref &ref);
+	void Dump();
+	bool IsModifierKey(uint32 keyCode);
+	uint8 IsDeadKey(uint32 keyCode, uint32 modifiers);
+	bool IsDeadSecondKey(uint32 keyCode, uint32 modifiers, uint8 activeDeadKey);
+	void GetChars(uint32 keyCode, uint32 modifiers, uint8 activeDeadKey, char** chars, int32* numBytes);
+	status_t Use();
+	static void GetKey( char *chars, int32 offset, char* string);
+private:
+	char *fChars;
+	key_map fKeys;
+	uint32 fCharsSize;
+};
+
+
+#endif //KEYMAP_H
diff --git a/src/apps/bin/keymap/key_map.cpp b/src/apps/bin/keymap/key_map.cpp
new file mode 100644
index 0000000000..a3a4bf7a79
--- /dev/null
+++ b/src/apps/bin/keymap/key_map.cpp
@@ -0,0 +1,56 @@
+// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+//
+//  Copyright (c) 2004, Haiku
+//
+//  This software is part of the Haiku distribution and is covered
+//  by the Haiku license.
+//
+//
+//  File:        key_map.cpp
+//  Author:      Jérôme Duval
+//  Description: keymap bin
+//  Created :    July 30, 2004
+//
+// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+
+#include <stdio.h>
+#include <string.h>
+#include "Keymap.h"
+
+
+static void usage(char *prog)
+{
+	printf(
+"usage: %s -d  # dump key map to standard output\n"
+"       %s -l  # load key map from standard input\n"
+"       %s -r  # restore system default key map\n", prog, prog, prog);
+}
+
+
+int main(int argc, char **argv)
+{
+	char operation = ' ';
+	int i;
+	for (i = 1; i < argc; i++) {
+		if (strncmp(argv[i], "-", 1) == 0) {
+			if (strlen(argv[i]) > 1)
+				operation = argv[i][1];
+			else 
+				break;
+			if (operation == 'd') {
+				Keymap keymap;
+				keymap.LoadCurrent();
+				keymap.Dump();
+				return 0;
+			}
+		} else {
+			if (operation == 'o') {
+				//return do_compile(argv[i]);
+				return 0;
+			} else 
+				break;
+		}
+	}
+	usage("/bin/keymap");
+	return 1;
+}