3 files changed, 14 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/compat/Makefile.am b/xorg-server/xkbdata.src/compat/Makefile.am
index 4e56a2427..54a659eec 100644
--- a/xorg-server/xkbdata.src/compat/Makefile.am
+++ b/xorg-server/xkbdata.src/compat/Makefile.am
@@ -1,7 +1,7 @@
 compatdir = $(xkb_base)/compat
 
 dist_compat_DATA = \
-accessx basic complete \
+accessx basic caps complete \
 default iso9995 \
 japan keypad ledcaps \
 lednum ledscroll level5 \
diff --git a/xorg-server/xkbdata.src/compat/caps b/xorg-server/xkbdata.src/compat/caps
new file mode 100644
index 000000000..d787ab63d
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/caps
@@ -0,0 +1,12 @@
+partial xkb_compatibility "caps_lock"  {
+    // Keysym Caps_Lock locks Lock modifier.
+    // With this, the keysym Caps_Lock can be used without binding the whole
+    // key to a real modifier.
+	// This is essential when you don't want to use caps lock on the first
+	// level.
+	// This should not have any compatibility issues when used together with
+	// other layouts which don't utilize this capability.
+    interpret Caps_Lock {
+        action = LockMods(modifiers = Lock);
+    };
+};
diff --git a/xorg-server/xkbdata.src/compat/makefile b/xorg-server/xkbdata.src/compat/makefile
index 486ca5541..225163288 100644
--- a/xorg-server/xkbdata.src/compat/makefile
+++ b/xorg-server/xkbdata.src/compat/makefile
@@ -7,7 +7,7 @@ THISDIR=compat
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
 
 dist_xkbdata_compat_DATA = \
-accessx basic complete \
+accessx basic caps complete \
 default iso9995 \
 japan keypad ledcaps \
 lednum ledscroll level5 \