diff --git a/misc/Makefile.am b/misc/Makefile.am
index 17c495c7d..7c6e467c2 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -30,7 +30,8 @@ SCRIPTS_OUT = \
 LIBFILES_CONST = \
 	filehighlight.ini \
 	mc.default.keymap \
-	mc.emacs.keymap
+	mc.emacs.keymap \
+	mc.vim.keymap
 
 
 LIBFILES_SCRIPT = \
diff --git a/misc/mc.vim.keymap b/misc/mc.vim.keymap
new file mode 100644
index 000000000..d3c322077
--- /dev/null
+++ b/misc/mc.vim.keymap
@@ -0,0 +1,366 @@
+[filemanager]
+ChangePanel = tab; ctrl-i
+Help = f1
+UserMenu = f2
+View = f3
+# ViewFile =
+Edit = f4
+# EditForceInternal =
+Copy = f5
+Move = f6
+MakeDir = f7
+Delete = f8
+Menu = f9
+Quit = f10
+MenuLastSelected = f19
+QuitQuiet = f20
+Find = alt-question
+CdQuick = alt-c
+HotList = ctrl-backslash
+Reread = ctrl-r
+DirSize = ctrl-space
+Suspend = ctrl-z
+Swap = ctrl-u
+History = alt-m
+# PanelListing =
+# SetupListingFormat =
+ShowHidden = alt-dot
+SplitVertHoriz = alt-comma
+SplitEqual = alt-equal
+SplitMore = shift-l
+SplitLess = shift-h
+Shell = ctrl-o
+PutCurrentPath = shift-a
+PutOtherPath = shift-d
+PutCurrentSelected = shift-w
+PutCurrentFullSelected = shift-f
+ViewFiltered = alt-exclamation
+Select = kpplus
+Unselect = kpminus
+SelectInvert = kpasterisk
+ScreenList = alt-prime
+# OptionsLayout =
+# OptionsAppearance =
+# OptionsPanel =
+# OptionsConfirm =
+# OptionsDisplayBits =
+# OptionsVfs =
+# LearnKeys =
+# SaveSetup =
+# EditExtensionsFile =
+# EditFileHighlightFile =
+# Filter =
+# ConnectFish =
+# ConnectFtp =
+# Undelete =
+# EditorViewerHistory =
+ExtendedKeyMap = ctrl-x
+
+[filemanager:xmap]
+ChangeMode = c
+ChangeOwn = o
+ChangeAttributes = e
+CompareDirs = d
+CompareFiles = ctrl-d
+HotListAdd = h
+LinkSymbolicEdit = ctrl-s
+Link = l
+LinkSymbolic = s
+LinkSymbolicRelative = v
+PanelInfo = i
+PanelQuickView = q
+ExternalPanelize = exclamation
+VfsList = a
+Jobs = j
+# PutCurrentPath =
+# PutOtherPath =
+# PutCurrentTagged =
+# PutOtherTagged =
+# PutCurrentLink =
+# PutOtherLink =
+
+[panel]
+CycleListingFormat = alt-t
+Search = ctrl-s; alt-s
+Mark = insert; ctrl-t; shift-m
+MarkUp = shift-k
+MarkDown = shift-j
+# MarkLeft =
+# MarkRight =
+Down = down; ctrl-n
+Up = up; ctrl-p
+# Left =
+# Right =
+PageUp = pgup; shift-{
+PageDown = pgdn; shift-}
+Enter = enter
+PanelOtherCd = alt-o
+PanelOtherCdLink = alt-l
+ViewRaw = f13
+EditNew = f14
+CopySingle = f15
+MoveSingle = f16
+DeleteSingle = f18
+# SelectExt =
+Select = alt-plus
+Unselect = alt-minus
+SelectInvert = alt-asterisk
+CdChild = alt-j
+CdParent = alt-k
+# CdParentSmart =
+# Panelize =
+History = alt-h
+HistoryNext = alt-u
+HistoryPrev = alt-y
+# BottomOnScreen =
+# MiddleOnScreen =
+# TopOnScreen =
+PanelOtherSync = alt-i
+SelectCodepage = alt-e
+Top = alt-lt; home; a1
+Bottom = alt-gt; end; c1
+# Sort =
+# SortPrev =
+# SortNext =
+# SortReverse =
+# SortByName =
+# SortByExt =
+# SortBySize =
+# SortByMTime =
+# Filter =
+# ScrollLeft =
+# ScrollRight =
+
+[dialog]
+Ok = enter
+Cancel = f10; esc; ctrl-g
+Up = left; up; ctrl-p
+Down = right; down; ctrl-n
+# Left =
+# Right =
+Help = f1
+Suspend = ctrl-z
+Refresh = ctrl-l
+ScreenList = alt-prime
+ScreenNext = alt-rbrace
+ScreenPrev = alt-lbrace
+
+[menu]
+Help = f1
+Left = left; ctrl-b
+Right = right; ctrl-f
+Up = up; ctrl-p
+Down = down; ctrl-n
+Home = home; alt-lt; ctr-a
+End = end; alt-gt ctrl-e
+Enter = enter
+Quit = F10; esc; ctrl-g
+
+[input]
+Home = ctrl-a; alt-lt; home; a1
+End = ctrl-e; alt-gt; end; c1
+Left = left; alt-left; ctrl-b
+Right = right; alt-right; ctrl-f
+WordLeft = ctrl-left; alt-b
+WordRight = ctrl-right; alt-f
+Backspace = backspace; ctrl-h
+Delete = delete; ctrl-d
+DeleteToWordBegin = alt-backspace
+DeleteToWordEnd = alt-d
+# Mark =
+Remove = ctrl-w
+# Cut =
+Store = alt-w
+# Paste =
+Yank = ctrl-y
+DeleteToEnd = ctrl-k
+HistoryPrev = alt-p
+HistoryNext = alt-n
+History = alt-h
+Complete = alt-tab
+# Clear =
+# MarkLeft =
+# MarkRight =
+# MarkToWordBegin =
+# MarkToWordEnd =
+# MarkToHome =
+# MarkToEnd =
+
+[listbox]
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; shift-{
+PageDown = pgdn; shift-}
+Delete = delete; d
+Clear = shift-delete; shift-d
+View = f3
+Edit = f4
+Enter = enter
+
+[radio]
+Up = up; ctrl-p
+Down = down; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+Select = space
+
+[tree]
+Help = f1
+Reread = f2; ctrl-r
+Forget = f3
+ToggleNavigation = f4
+Copy = f5
+Move = f6
+Up = up; ctrl-p
+Down = down; ctrl-n
+Left = left; ctrl-b
+Right = right; ctrl-f
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; shift-{
+PageDown = pgdn; shift-}
+Enter = enter
+Search = ctrl-s; alt-s
+Delete = f8; delete
+
+[help]
+Help = f1
+Index = f2; c
+Back = f3; left; h; ctrl-b
+Quit = f10; esc
+Up = up; k; ctrl-p
+Down = down; j; ctrl-n
+PageDown = f; pgdn; space; shift-}
+PageUp = b; pgup; backspace; shift-{
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+Enter = l; ctrl-f; right; enter
+LinkNext = tab
+LinkPrev = alt-tab
+NodeNext = n
+NodePrev = p
+
+[chattr]
+Up = up; left; ctrl-p
+Down = down; right; ctrl-n
+Top = home; alt-lt; a1
+Bottom = end; alt-gt; c1
+PageUp = pgup; shift-{
+PageDown = pgdn; shift-}
+Mark = t
+MarkAndDown = shift-t; insert
+
+[editor]
+# No remapping, just use vim instead of mcedit
+
+[viewer]
+Help = f1
+WrapMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Search = f7
+SearchForward = slash
+SearchBackward = question
+SearchContinue = f17; n
+SearchForwardContinue = ctrl-s
+SearchBackwardContinue = ctrl-r
+SearchOppositeContinue = shift-n
+MagicMode = f8
+NroffMode = f9
+Home = ctrl-a
+End = ctrl-e
+Left = h; left
+Right = l; right
+LeftQuick = alt-h
+RightQuick = alt-l
+Up = k; insert; up; ctrl-p
+Down = j; delete; down; enter; ctrl-n
+PageDown = f; space; pgdn; shift-}
+PageUp = b; pgup; backspace; shift-{
+HalfPageDown = d
+HalfPageUp = u
+Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+BookmarkGoto = m
+Bookmark = r
+FileNext = ctrl-f
+FilePrev = ctrl-b
+SelectCodepage = alt-e
+Shell = ctrl-o
+Ruler = alt-r
+History = alt-m
+
+[viewer:hex]
+Help = f1
+HexEditMode = f2
+Quit = f3; f10; q; esc
+HexMode = f4
+Goto = f5
+Save = f6
+Search = f7
+SearchForward = slash
+SearchBackward = question
+SearchContinue = f17; n
+SearchForwardContinue = ctrl-s
+SearchBackwardContinue = ctrl-r
+SearchOppositeContinue = shift-n
+MagicMode = f8
+NroffMode = f9
+ToggleNavigation = tab
+Home = ctrl-a; home
+End = ctrl-e; end
+Left = h; left
+Right = l; right
+Up = k; up
+Down = j; down; delete
+PageDown = pgdn; shift-}
+PageUp = pgup; shift-{
+Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
+Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
+History = alt-m
+
+[diffviewer]
+ShowSymbols = alt-s
+ShowNumbers = alt-n
+SplitFull = f
+SplitEqual = equal
+SplitMore = gt
+SplitLess = lt
+Tab2 = 2
+Tab3 = 3
+Tab4 = 4
+Tab8 = 8
+Swap = ctrl-u
+Redo = ctrl-r
+HunkNext = n; enter; space
+HunkPrev = p; backspace
+Goto = g; shift-g
+Save = f2
+Edit = f4
+EditOther = f14
+Merge = f5
+MergeOther = f15
+Search = f7
+SearchContinue = f17
+Options = f9
+Top = ctrl-home
+Bottom = ctrl-end
+Down = down; j
+Up = up; k
+LeftQuick = alt-h
+RightQuick = alt-l
+Left = left; h
+Right = right; l
+PageDown = pgdn; shift-}
+PageUp = pgup; shift-{
+Home = home
+End = end
+Help = f1
+Quit = f10; q; shift-q; esc
+Shell = ctrl-o
+SelectCodepage = alt-e