--- programs/xkbcomp/rules/base.lst.orig	2004-07-23 23:01:15.000000000 +0200
+++ programs/xkbcomp/rules/base.lst	2004-07-24 02:03:09.232537431 +0200
@@ -26,6 +26,7 @@
   btc5090         BTC 5090
   cherryblue      Cherry Blue Line CyBo@rd
   cherrybluea     Cherry Blue Line CyBo@rd (alternate option)
+  cherryblueb     Cherry CyMotion Master XPress
   chicony         Chicony Internet Keyboard
   chicony9885     Chicony KB-9885
   compaqeak8      Compaq Easy Access Keyboard
--- programs/xkbcomp/rules/xorg.xml.orig	2003-11-19 18:32:41.000000000 +0100
+++ programs/xkbcomp/rules/base.xml.in	2003-11-19 18:33:58.000000000 +0100
@@ -174,6 +174,12 @@
     </model>
     <model>
       <configItem>
+        <name>cherryblueb</name>
+        <description>Cherry CyMotion Master XPress</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>cherrybluea</name>
         <description>Cherry Blue Line CyBo@rd (alternate option)</description>
         <description xml:lang="ru">Cherry Blue Line CyBo@rd (альтернативный вариант)</description>
--- programs/xkbcomp/rules/xorg.orig	2003-11-19 18:34:20.000000000 +0100
+++ programs/xkbcomp/rules/base	2003-11-19 18:34:40.000000000 +0100
@@ -102,7 +102,7 @@
 ! $inetkbds = airkey acpi scorpius \
               brother \
               btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090\
-              cherryblue cherrybluea \
+              cherryblue cherrybluea cherryblueb \
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
               dell inspiron \
--- programs/xkbcomp/symbols/inet.orig	2003-11-19 18:08:19.000000000 +0100
+++ programs/xkbcomp/symbols/inet	2003-11-19 19:56:53.000000000 +0100
@@ -242,6 +242,48 @@
 };
 
 partial alphanumeric_keys
+xkb_symbols "cherryblueb" {
+    name[Group1]= "Cherry CyMotion Master XPress";
+
+    key <I0B>	{	[ XF86ScrollUp		]	};
+    key <I12>   {       [ XF86ScrollDown        ]       };
+    key <I17>   {       [ XF86Cut               ]       };
+    key <I0A>   {       [ XF86Copy              ]       };
+    key <I18>   {       [ XF86Paste             ]       };
+    key <I71>   {       [ XF86Book              ]       };
+    key <I2C>   {       [ XF86Book              ]       };
+    key <I72>   {       [ XF86Book              ]       };
+    key <I07>   {       [ XF86Forward           ]       };
+    key <I08>   {       [ XF86Back              ]       };
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I20>   {       [ XF86AudioMute         ]       };
+    key <I6D>   {       [ XF86AudioMedia        ]       };
+    key <I67>   {       [ XF86AudioRewind       ]       };
+    key <I10>   {       [ XF86Back              ]       };
+    key <I19>   {       [ XF86Forward           ]       };
+    key <I70>   {       [ XF86Eject             ]       };
+    key <I32>   {       [ XF86Finance           ]       };
+    key <I6A>   {       [ XF86Back              ]       };
+    key <I69>   {       [ XF86Forward           ]       };
+    key <I68>   {       [ XF86Stop              ]       };
+    key <FK16>  {       [ XF86Reload            ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86MyComputer        ]       };
+    key <I02>   {       [ XF86HomePage          ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <PRSC>  {       [ XF86Terminal          ]       };
+    key <I21>   {       [ XF86Calculator        ]       };
+    key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I26>   {       [ XF86AudioMute         ]       };
+    key <I25>   {       [ XF86AudioLowerVolume  ]       };
+    key <XFER>  {       [ XF86Go                ]       };
+    key <I24>   {       [ XF86AudioStop                 ] };
+    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <I63>   {       [ XF86Standby                   ] };
+};
+
+partial alphanumeric_keys
 xkb_symbols "cherrybluea" {
     name[Group1]= "Cherry Blue Line CyBo@rd (alternate option)";