Index: xkeyboard-config/rules/base.o_s.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.o_s.part,v
retrieving revision 1.21
diff -u -r1.21 base.o_s.part
--- xkeyboard-config/rules/base.o_s.part	4 Jan 2007 23:31:30 -0000	1.21
+++ xkeyboard-config/rules/base.o_s.part	26 May 2007 19:56:57 -0000
@@ -68,3 +68,4 @@
   nbsp:level3n          =	+nbsp(level3n)
   nbsp:level4           =	+nbsp(level4)
   nbsp:level4n          =	+nbsp(level4n)
+  japan:nicola_f_bs	=	+jp(nicola_f_bs)
Index: xkeyboard-config/rules/base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.182
diff -u -r1.182 base.xml.in
--- xkeyboard-config/rules/base.xml.in	13 May 2007 23:10:58 -0000	1.182
+++ xkeyboard-config/rules/base.xml.in	26 May 2007 19:56:58 -0000
@@ -3770,6 +3770,12 @@
           <_description>Kana Lock key is locking</_description>
        </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>japan:nicola_f_bs</name>
+          <_description>NICOLA-F style Backspace</_description>
+       </configItem>
+      </option>
     </group>
   </optionList>
 </xkbConfigRegistry>
Index: xkeyboard-config/symbols/jp
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/jp,v
retrieving revision 1.13
diff -u -r1.13 jp
--- xkeyboard-config/symbols/jp	29 Oct 2006 14:23:23 -0000	1.13
+++ xkeyboard-config/symbols/jp	26 May 2007 19:57:02 -0000
@@ -198,3 +198,15 @@
     };
 };
 
+partial alphanumeric_keys
+xkb_symbols "nicola_f_bs" {
+    key <BKSP> {
+       type="",
+       symbols[Group1]= [ bracketright, braceright ]
+    };
+    key <AE10> { [ 0,underscore         ] };
+    key <AD11> { [ colon, asterisk      ] };
+    key <AC11> { [ BackSpace, BackSpace ] };
+    key <AC12> { [ Escape               ] };
+    key <AB11> { [ at, grave            ] };
+};