diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 0dce5b4b3bc1..9be706fbbbaf 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2395,6 +2395,7 @@ Other:
 - Fixed =bepo= layout, commented out broken evil-window :common bindings
   (thanks to CharlesHD)
 - Added evil-lisp-state mapping (thanks to Damien Picard)
+- Added ediff mapping (thanks to iv-nn)
 **** Kivy
 - Added the =kivy= package (thanks to Nasser Alshammari and Ryota Kayanuma)
 **** LaTeX
diff --git a/layers/+intl/keyboard-layout/README.org b/layers/+intl/keyboard-layout/README.org
index 691fbc0ff844..d2cc56580cfb 100644
--- a/layers/+intl/keyboard-layout/README.org
+++ b/layers/+intl/keyboard-layout/README.org
@@ -243,6 +243,7 @@ The available configurations are:
 - avy
 - comint
 - company
+- ediff
 - elfeed
 - evil
 - evil-escape
diff --git a/layers/+intl/keyboard-layout/packages.el b/layers/+intl/keyboard-layout/packages.el
index 9cd375120239..38fbf0b8c571 100644
--- a/layers/+intl/keyboard-layout/packages.el
+++ b/layers/+intl/keyboard-layout/packages.el
@@ -15,6 +15,7 @@
     avy
     comint
     company
+    ediff
     elfeed
     evil
     evil-cleverparens
@@ -105,6 +106,20 @@
       "C-k"
       "C-l")))
 
+(defun keyboard-layout/pre-init-ediff ()
+  (kl|config ediff
+    :description
+    "Remap `ediff' bindings."
+    :loader
+    ;; HACK: ediff-mode-map is only defined when ediff is started
+    (add-hook 'ediff-startup-hook #'(lambda () BODY))
+    :common
+    (kl/correct-keys ediff-mode-map
+      "h"
+      "j"
+      "k"
+      "l")))
+
 (defun keyboard-layout/pre-init-elfeed ()
   (kl|config elfeed
     :description