diff --git a/compat/complete b/compat/complete
index dd49a5c..cd8d059 100644
--- a/compat/complete
+++ b/compat/complete
@@ -8,5 +8,6 @@ default xkb_compatibility "complete"  {
     augment "misc"
     augment "xfree86"
     augment "level5"
+    augment "caps(caps_lock)"
 };
 
diff --git a/compat/default b/compat/default
index 5355e13..090793f 100644
--- a/compat/default
+++ b/compat/default
@@ -10,4 +10,5 @@ default xkb_compatibility "default"  {
 // ??should be changed/renamed/removed
 //    augment "xfree86"
     augment "japan"
+    augment "caps(caps_lock)"
 };
diff --git a/symbols/shift b/symbols/shift
index cc97b5c..78951c1 100644
--- a/symbols/shift
+++ b/symbols/shift
@@ -23,8 +23,7 @@ partial modifier_keys
 xkb_symbols "lshift_both_capslock" {
   key <LFSH> {
     type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ Shift_L,                  Caps_Lock                ],
-    actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ]
+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
   };
 };
 // When pressed together with another Shift key, set or unset Lock.
@@ -32,8 +31,7 @@ partial modifier_keys
 xkb_symbols "rshift_both_capslock" {
   key <RTSH> {
     type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ Shift_R,                  Caps_Lock                ],
-    actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ]
+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
   };
 };
 partial modifier_keys