diff --git a/packages/sysutils/remote/lirc/config/lircd.conf.rpi b/packages/sysutils/remote/lirc/config/lircd.conf.rpi
index 94bd3f8939..494d26c287 100644
--- a/packages/sysutils/remote/lirc/config/lircd.conf.rpi
+++ b/packages/sysutils/remote/lirc/config/lircd.conf.rpi
@@ -2,13 +2,13 @@
 #
 # Lirc config for lirc_rpi (GPIO) receiver.
 # Enables use of MCE Remote, Apple MacMini and XBOX remote.
+# Should work with any generic receiver 
 #
 ########
 #
 # brand:                        HP/Philips/Microsoft/Other
 # model no. of remote control:  Media Center Edition remote
-# devices being controlled by this remote: HP Slimline S3100y and a
-# myriad of devices with Media Center Edition receivers
+# devices being controlled by this remote: myriad of devices with Media Center Edition receivers
 #
 # RC-6 config file
 #
@@ -36,9 +36,7 @@
 # Updated with codes for MCE 2007 Remote additional buttons
 # Visualization, Aspect, SlideShow, Eject
 # Note: 
-# Renamed some buttons: DVD->DVDMenu, More->MoreInfo, Star->Asterisk, Hash->Pound
-# Note: 
-# Blue, Yellow, Green, Red, and Teletext buttons do not exist on the HP remote
+# Blue, Yellow, Green, Red, and Teletext buttons do not exist on some HP remote
 
 begin remote
 
@@ -56,13 +54,16 @@ begin remote
   gap              105000
   toggle_bit           22
   rc6_mask    0x100000000
+  min_repeat      4                                                            
+#  uncomment to suppress unwanted repeats                           
+  suppress_repeat 4                                                
 
 
       begin codes
 
 #seen on HP Pavilion dv3t remote  --Tim Mann, 3 Nov 2009
-	Media         0x00007b7f
-	PlayPause     0x00007b91
+	KEY_VIDEO         0x00007b7f
+	KEY_PLAYPAUSE     0x00007b91
 
 
 #unused by HP remote
@@ -70,7 +71,7 @@ begin remote
 	KEY_YELLOW	      0x00007ba2
 	KEY_GREEN	      0x00007ba3
 	KEY_RED	      0x00007ba4
-	Teletext      0x00007ba5
+	KEY_TEXT      0x00007ba5
 
 #ba6 - bae unused 
         BA6           0x00007ba6
@@ -92,8 +93,8 @@ begin remote
         BB4           0x00007bb4
 
         KEY_VIDEO        0x00007bb5
-        Pictures      0x00007bb6
-        RecTV         0x00007bb7
+        KEY_CAMERA       0x00007bb6
+        KEY_PVR         0x00007bb7
         KEY_AUDIO         0x00007bb8
         KEY_TV            0x00007bb9
 
@@ -132,9 +133,9 @@ begin remote
         BD6           0x00007bd6
         BD7           0x00007bd7
 
-        Aspect        0x00007bd8
-        Guide         0x00007bd9
-        LiveTV        0x00007bda
+        KEY_ANGLE        0x00007bd8
+        KEY_EPG         0x00007bd9
+        KEY_TV        0x00007bda
         KEY_DVD           0x00007bdb
 #NoGap
         KEY_BACK          0x00007bdc
@@ -144,10 +145,10 @@ begin remote
         KEY_DOWN          0x00007be0
         KEY_UP            0x00007be1
 #NoGap
-        Star          0x00007be2
-        Hash          0x00007be3
+        KEY_NUMERIC_STAR          0x00007be2
+        KEY_NUMERIC_POUND          0x00007be3
 #NoGap
-        KEY_AGAIN        0x00007be4
+        KEY_PREVIOUS      0x00007be4
         KEY_NEXT          0x00007be5
         KEY_STOP          0x00007be6
         KEY_PAUSE         0x00007be7
@@ -161,7 +162,7 @@ begin remote
         KEY_VOLUMEDOWN       0x00007bee
         KEY_VOLUMEUP         0x00007bef
 #NoGap
-        More          0x00007bf0
+        KEY_INFO          0x00007bf0
         KEY_MUTE          0x00007bf1
         KEY_HOME          0x00007bf2
         KEY_POWER         0x00007bf3
@@ -183,7 +184,6 @@ begin remote
 
 end remote
 
-#
 # this config file was automatically generated
 # using lirc-0.8.2(macmini) on Tue Dec 11 11:35:26 2007
 #
@@ -229,14 +229,13 @@ end remote
 #
 # contributed by 
 #
-# brand:                       xbox.conf
-# model no. of remote control: 
-# devices being controlled by this remote:
-#
+# brand:             Microsoft
+# model:             Xbox DVD Remote
+# devices being controlled by this remote: xbox
 
 begin remote
 
-  name  xbox.conf
+  name  XboxDVDDongle
   bits            8
   eps            30
   aeps          100
@@ -245,7 +244,7 @@ begin remote
   zero            0     0
   gap          63950
   min_repeat      4
-#  suppress_repeat 4
+  suppress_repeat 4
 #  uncomment to suppress unwanted repeats
 #  toggle_bit_mask 0x72
   toggle_bit_mask 0xE1
@@ -282,4 +281,3 @@ begin remote
 
 end remote
 
-