diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/install b/packages/mediacenter/xbmc-theme-PM3-HD/install
old mode 100755
new mode 100644
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 4ea16a6758..22bbae5fe0 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -127,7 +127,7 @@ mkdir -p $INSTALL/usr/share/xbmc/addons
 
 # other programs needed to run
   $SCRIPTS/install alsa
-  $SCRIPTS/install lirc
+  $SCRIPTS/install remote
   [ ! "$LCD_DRIVER" = none ] && $SCRIPTS/install lcdproc
   [ "$SENSOR_SUPPORT" = yes ] && $SCRIPTS/install lm_sensors
   [ "$UPDATE_SUPPORT" = yes ] && $SCRIPTS/install autoupdate
diff --git a/packages/mediacenter/xbmc/patches/462-xbmc-add_remote_irtrans_mediacenter-0.1.diff b/packages/mediacenter/xbmc/patches/462-xbmc-add_remote_irtrans_mediacenter-0.1.diff
new file mode 100644
index 0000000000..2b969b601e
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/462-xbmc-add_remote_irtrans_mediacenter-0.1.diff
@@ -0,0 +1,52 @@
+diff -Naur xbmc-29490/system/Lircmap.xml xbmc-29490.patch/system/Lircmap.xml
+--- xbmc-29490/system/Lircmap.xml	2010-04-24 22:45:26.000000000 +0200
++++ xbmc-29490.patch/system/Lircmap.xml	2010-04-28 22:00:13.734656322 +0200
+@@ -362,4 +362,48 @@
+ 		<recordedtv>recordlist</recordedtv>
+ 		<title>teletext</title>
+ 	</remote>
++	<remote device="mediacenter">
++		<pause>pause</pause>
++		<stop>stop</stop>
++		<forward>fwd</forward>
++		<reverse>rew</reverse>
++		<left>left</left>
++		<right>right</right>
++		<up>up</up>
++		<down>down</down>
++		<select>ok</select>
++		<pageplus>ch+</pageplus>
++		<pageminus>ch-</pageminus>
++		<back>back</back>
++		<menu>clear</menu>
++		<title>play</title>
++		<info>info</info>
++		<skipplus>next</skipplus>
++		<skipminus>prev</skipminus>
++		<display>teletext</display>
++		<start>ehome</start>
++		<record>rec</record>
++		<volumeplus>vol+</volumeplus>
++		<volumeminus>vol-</volumeminus>
++		<mute>mute</mute>
++		<power>power</power>
++		<myvideo>video</myvideo>
++		<mymusic>music</mymusic>
++		<mypictures>pictures</mypictures>
++		<mytv>tv</mytv>
++		<one>1</one>
++		<two>2</two>
++		<three>3</three>
++		<four>4</four>
++		<five>5</five>
++		<six>6</six>
++		<seven>7</seven>
++		<eight>8</eight>
++		<nine>9</nine>
++		<zero>0</zero>
++		<mytv>red</mytv>
++		<mymusic>green</mymusic>
++		<mypictures>yellow</mypictures>
++		<myvideo>blue</myvideo>
++	</remote>
+ </lircmap>
diff --git a/packages/sysutils/irserver/init.d/30_irserver b/packages/sysutils/irserver/init.d/30_irserver
deleted file mode 100755
index 16e8c106c5..0000000000
--- a/packages/sysutils/irserver/init.d/30_irserver
+++ /dev/null
@@ -1,19 +0,0 @@
-# start the IRtrans daemon
-#
-# runlevels: openelec, textmode
-
-IRTRANS_DEV="/dev/irtrans0"
-IRSERVER_LOG="/var/log/irserver.log"
-IRSERVER_PID="/var/run/irserver.pid"
-
-[ "$DEBUG" = "yes" ] && \
-  IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
-
-(
-  progress "Starting IRtrans daemon"
-
-  irserver -logfile $IRSERVER_LOG \
-           -pidfile $IRSERVER_PID \
-           -daemon $IRTRANS_DEV \
-           $IRSERVER_ARG > /dev/null 2>&1
-)&
diff --git a/packages/sysutils/lcdproc/config/lcd.conf b/packages/sysutils/lcdproc/config/lcd.conf
new file mode 100644
index 0000000000..6259b17772
--- /dev/null
+++ b/packages/sysutils/lcdproc/config/lcd.conf
@@ -0,0 +1,7 @@
+# Setup LCD/VFD driver ( none / irtrans )
+#
+# none:     no LCD/VFD hardware is installed
+#
+# irtrans:  use irtrans as LCD/VFD driver
+
+LCD_DRIVER="none"
diff --git a/packages/sysutils/lcdproc/init.d/33_lcdproc b/packages/sysutils/lcdproc/init.d/33_lcdproc
index 119dbef8bc..a64dcfcb81 100755
--- a/packages/sysutils/lcdproc/init.d/33_lcdproc
+++ b/packages/sysutils/lcdproc/init.d/33_lcdproc
@@ -2,9 +2,12 @@
 #
 # runlevels: openelec, textmode
 
-(
+[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
+
+if [ ! "$LCD_DRIVER" = "none" -a -z "$LCD_DRIVER" ]; then
+
   progress "Starting LCD daemon"
 
-  LCDd -c /etc/LCDd.conf > /dev/null 2>&1
+  LCDd -c /etc/LCDd.conf -d $LCD_DRIVER > /dev/null 2>&1
 
-)&
+fi
\ No newline at end of file
diff --git a/packages/sysutils/lcdproc/install b/packages/sysutils/lcdproc/install
index 969d25da3c..d395d781a0 100755
--- a/packages/sysutils/lcdproc/install
+++ b/packages/sysutils/lcdproc/install
@@ -16,5 +16,8 @@ mkdir -p $INSTALL/usr/sbin
 mkdir -p $INSTALL/usr/lib/lcdproc
   cp $PKG_BUILD/server/drivers/*.so $INSTALL/usr/lib/lcdproc
 
+mkdir -p $INSTALL/usr/config
+  cp $PKG_DIR/config/lcd.conf $INSTALL/usr/config
+
 mkdir -p $INSTALL/etc
   cp $PKG_BUILD/LCDd.conf $INSTALL/etc
diff --git a/packages/sysutils/lirc/init.d/32_lirc b/packages/sysutils/lirc/init.d/32_lirc
deleted file mode 100755
index 3501a9d8f2..0000000000
--- a/packages/sysutils/lirc/init.d/32_lirc
+++ /dev/null
@@ -1,18 +0,0 @@
-# start the LIRC daemon
-#
-# runlevels: openelec, textmode
-
-LIRC_DRIVER="default"
-LIRC_DEVICE="/dev/lirc0"
-LIRC_OUTPUT="/dev/lircd"
-
-(
-  progress "Starting LIRC daemon"
-
-
-  $IONICE mkdir -p /var/run/lirc
-
-    lircd --driver=$LIRC_DRIVER \
-          --device=$LIRC_DEVICE \
-          --output=$LIRC_OUTPUT
-)&
diff --git a/packages/sysutils/remote/config/remote.conf b/packages/sysutils/remote/config/remote.conf
new file mode 100644
index 0000000000..aafd0b010e
--- /dev/null
+++ b/packages/sysutils/remote/config/remote.conf
@@ -0,0 +1,9 @@
+# Setup remote control ( none / lirc / irtrans )
+#
+# none:     no remote control hardware is installed
+#
+# lirc:     use lirc as remotecontrol backend (default)
+#
+# irtrans:  use irtrans as remotecontrol backend
+
+REMOTE_BACKEND="lirc"
diff --git a/packages/sysutils/remote/install b/packages/sysutils/remote/install
new file mode 100755
index 0000000000..5f8129d2c2
--- /dev/null
+++ b/packages/sysutils/remote/install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/install lirc
+$SCRIPTS/install irserver
+
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
+mkdir -p $INSTALL/usr/config
+  cp $PKG_DIR/config/*.conf $INSTALL/usr/config
\ No newline at end of file
diff --git a/packages/sysutils/irserver/build b/packages/sysutils/remote/irserver/build
similarity index 100%
rename from packages/sysutils/irserver/build
rename to packages/sysutils/remote/irserver/build
diff --git a/packages/sysutils/irserver/config/81-irtrans.rules b/packages/sysutils/remote/irserver/config/81-irtrans.rules
similarity index 100%
rename from packages/sysutils/irserver/config/81-irtrans.rules
rename to packages/sysutils/remote/irserver/config/81-irtrans.rules
diff --git a/packages/sysutils/remote/irserver/init.d/30_irserver b/packages/sysutils/remote/irserver/init.d/30_irserver
new file mode 100755
index 0000000000..cc77fcf556
--- /dev/null
+++ b/packages/sysutils/remote/irserver/init.d/30_irserver
@@ -0,0 +1,25 @@
+# start the IRtrans daemon
+#
+# runlevels: openelec, textmode
+
+[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
+[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
+
+if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
+
+  progress "Starting IRtrans daemon"
+
+  IRTRANS_DEV="/dev/irtrans0"
+  IRSERVER_LOG="/var/log/irserver.log"
+  IRSERVER_PID="/var/run/irserver.pid"
+
+  [ ! "$REMOTE_BACKEND" = "irtrans" ] && \
+    IRSERVER_ARG="$IRSERVER_ARG -no_lirc" # dont run in lirc mode
+
+  [ "$DEBUG" = "yes" ] && \
+    IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
+
+  irserver -logfile $IRSERVER_LOG -pidfile $IRSERVER_PID \
+           -daemon $IRTRANS_DEV $IRSERVER_ARG > /dev/null 2>&1
+
+fi
\ No newline at end of file
diff --git a/packages/sysutils/irserver/install b/packages/sysutils/remote/irserver/install
similarity index 90%
rename from packages/sysutils/irserver/install
rename to packages/sysutils/remote/irserver/install
index 8c196ca804..4f33270239 100755
--- a/packages/sysutils/irserver/install
+++ b/packages/sysutils/remote/irserver/install
@@ -12,8 +12,6 @@ mkdir -p $INSTALL/usr/sbin
 mkdir -p $INSTALL/usr/share/irtrans/remotes
   cp $PKG_BUILD/remotes/irtrans.rem $INSTALL/usr/share/irtrans/remotes
   cp $PKG_BUILD/remotes/mediacenter.rem $INSTALL/usr/share/irtrans/remotes
-  cp $PKG_DIR/remotes/*.rem $INSTALL/usr/share/irtrans/remotes
-
 
 mkdir -p $INSTALL/lib/udev/rules.d
   cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
diff --git a/packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff b/packages/sysutils/remote/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff
similarity index 100%
rename from packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff
rename to packages/sysutils/remote/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff
diff --git a/packages/sysutils/irserver/remotes/philips-rc197.rem b/packages/sysutils/remote/irserver/remotes/philips-rc197.rem
similarity index 100%
rename from packages/sysutils/irserver/remotes/philips-rc197.rem
rename to packages/sysutils/remote/irserver/remotes/philips-rc197.rem
diff --git a/packages/sysutils/irserver/url b/packages/sysutils/remote/irserver/url
similarity index 100%
rename from packages/sysutils/irserver/url
rename to packages/sysutils/remote/irserver/url
diff --git a/packages/sysutils/lirc/build b/packages/sysutils/remote/lirc/build
similarity index 100%
rename from packages/sysutils/lirc/build
rename to packages/sysutils/remote/lirc/build
diff --git a/packages/sysutils/lirc/config/lircd_mceusb.conf b/packages/sysutils/remote/lirc/config/lircd_mceusb.conf
similarity index 100%
rename from packages/sysutils/lirc/config/lircd_mceusb.conf
rename to packages/sysutils/remote/lirc/config/lircd_mceusb.conf
diff --git a/packages/sysutils/remote/lirc/init.d/32_lirc b/packages/sysutils/remote/lirc/init.d/32_lirc
new file mode 100755
index 0000000000..a1dd209292
--- /dev/null
+++ b/packages/sysutils/remote/lirc/init.d/32_lirc
@@ -0,0 +1,18 @@
+# start the LIRC daemon
+#
+# runlevels: openelec, textmode
+
+[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
+
+if [ "$REMOTE_BACKEND" = "lirc" ]; then
+
+  progress "Starting LIRC daemon"
+
+  LIRC_DRIVER="default"
+  LIRC_DEVICE="/dev/lirc0"
+  LIRC_OUTPUT="/dev/lircd"
+
+  $IONICE mkdir -p /var/run/lirc
+  lircd --driver=$LIRC_DRIVER --device=$LIRC_DEVICE --output=$LIRC_OUTPUT
+
+fi
diff --git a/packages/sysutils/lirc/install b/packages/sysutils/remote/lirc/install
similarity index 100%
rename from packages/sysutils/lirc/install
rename to packages/sysutils/remote/lirc/install
diff --git a/packages/sysutils/remote/lirc/lirc-use_lirc.h_from_kernel-0.1.diff b/packages/sysutils/remote/lirc/lirc-use_lirc.h_from_kernel-0.1.diff
new file mode 100644
index 0000000000..f70d415552
--- /dev/null
+++ b/packages/sysutils/remote/lirc/lirc-use_lirc.h_from_kernel-0.1.diff
@@ -0,0 +1,504 @@
+diff -Naur lirc-20100408/daemons/hardware.h lirc-20100408.patch/daemons/hardware.h
+--- lirc-20100408/daemons/hardware.h	2009-01-04 23:17:39.000000000 +0100
++++ lirc-20100408.patch/daemons/hardware.h	2010-04-09 16:05:14.406356679 +0200
+@@ -13,7 +13,7 @@
+ #ifndef _HARDWARE_H
+ #define _HARDWARE_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "ir_remote_types.h"
+ 
+ struct hardware
+diff -Naur lirc-20100408/daemons/hw_accent.h lirc-20100408.patch/daemons/hw_accent.h
+--- lirc-20100408/daemons/hw_accent.h	2007-07-29 20:20:06.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_accent.h	2010-04-09 16:05:14.356327542 +0200
+@@ -27,7 +27,7 @@
+ #ifndef _HW_ACCENT_H
+ #define _HW_ACCENT_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int accent_decode (struct ir_remote *remote,
+ 		   ir_code *prep,
+diff -Naur lirc-20100408/daemons/hw_bte.h lirc-20100408.patch/daemons/hw_bte.h
+--- lirc-20100408/daemons/hw_bte.h	2007-07-29 20:20:06.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_bte.h	2010-04-09 16:05:14.362326501 +0200
+@@ -26,7 +26,7 @@
+ #ifndef HW_BTE_H
+ #define HW_BTE_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int bte_decode(struct ir_remote *remote,
+ 	       ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_caraca.h lirc-20100408.patch/daemons/hw_caraca.h
+--- lirc-20100408/daemons/hw_caraca.h	2007-07-29 20:20:06.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_caraca.h	2010-04-09 16:05:14.400327269 +0200
+@@ -13,7 +13,7 @@
+ #ifndef HW_CARACA_H
+ #define HW_CARACA_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int caraca_decode(struct ir_remote *remote,
+ 		  ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_creative.h lirc-20100408.patch/daemons/hw_creative.h
+--- lirc-20100408/daemons/hw_creative.h	2007-07-29 20:20:07.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_creative.h	2010-04-09 16:05:14.393357176 +0200
+@@ -13,7 +13,7 @@
+ #ifndef _HW_CREATIVE_H
+ #define _HW_CREATIVE_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int creative_decode(struct ir_remote *remote,
+ 		    ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_ea65.h lirc-20100408.patch/daemons/hw_ea65.h
+--- lirc-20100408/daemons/hw_ea65.h	2007-07-29 20:20:07.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_ea65.h	2010-04-09 16:05:14.346327762 +0200
+@@ -24,7 +24,7 @@
+ #ifndef HW_EA65_H
+ #define HW_EA65_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int   ea65_decode(struct ir_remote *remote,
+ 		  ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_irlink.h lirc-20100408.patch/daemons/hw_irlink.h
+--- lirc-20100408/daemons/hw_irlink.h	2008-01-13 21:50:43.000000000 +0100
++++ lirc-20100408.patch/daemons/hw_irlink.h	2010-04-09 16:05:14.350327534 +0200
+@@ -23,7 +23,7 @@
+ #ifndef HW_IRLINK_H
+ #define HW_IRLINK_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int     irlink_decode                (struct ir_remote   *remote,
+ 				                      ir_code            *prep,
+diff -Naur lirc-20100408/daemons/hw_irman.h lirc-20100408.patch/daemons/hw_irman.h
+--- lirc-20100408/daemons/hw_irman.h	2007-07-29 20:20:08.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_irman.h	2010-04-09 16:05:14.368352769 +0200
+@@ -13,7 +13,7 @@
+ #ifndef _HW_IRMAN_H
+ #define _HW_IRMAN_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int irman_decode(struct ir_remote *remote,
+ 		 ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_logitech.h lirc-20100408.patch/daemons/hw_logitech.h
+--- lirc-20100408/daemons/hw_logitech.h	2007-07-29 20:20:08.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_logitech.h	2010-04-09 16:05:14.348327369 +0200
+@@ -13,7 +13,7 @@
+ #ifndef _HW_LOGITECH_H
+ #define _HW_LOGITECH_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int logitech_decode(struct ir_remote *remote,
+ 		    ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_mouseremote.h lirc-20100408.patch/daemons/hw_mouseremote.h
+--- lirc-20100408/daemons/hw_mouseremote.h	2007-07-29 20:20:08.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_mouseremote.h	2010-04-09 16:05:14.395328008 +0200
+@@ -16,7 +16,7 @@
+ #ifndef HW_MOUSEREMOTE_H
+ #define HW_MOUSEREMOTE_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int mouseremote_decode(struct ir_remote *remote,
+ 		       ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_mp3anywhere.h lirc-20100408.patch/daemons/hw_mp3anywhere.h
+--- lirc-20100408/daemons/hw_mp3anywhere.h	2007-07-29 20:20:08.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_mp3anywhere.h	2010-04-09 16:05:14.364357606 +0200
+@@ -15,7 +15,7 @@
+ #ifndef HW_MP3ANYWHERE_H
+ #define HW_MP3ANYWHERE_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int mp3anywhere_decode(struct ir_remote *remote,
+ 		       ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_mplay.h lirc-20100408.patch/daemons/hw_mplay.h
+--- lirc-20100408/daemons/hw_mplay.h	2007-12-22 13:33:16.000000000 +0100
++++ lirc-20100408.patch/daemons/hw_mplay.h	2010-04-09 16:05:14.389357823 +0200
+@@ -25,7 +25,7 @@
+ #ifndef HW_MPLAY_H
+ #define HW_MPLAY_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ extern int mplay_decode(struct ir_remote *remote,
+                         ir_code *prep,
+diff -Naur lirc-20100408/daemons/hw_pcmak.h lirc-20100408.patch/daemons/hw_pcmak.h
+--- lirc-20100408/daemons/hw_pcmak.h	2007-07-29 20:20:08.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_pcmak.h	2010-04-09 16:05:14.402362075 +0200
+@@ -14,7 +14,7 @@
+ #ifndef HW_PCMAK_H
+ #define HW_PCMAK_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int pcmak_decode(struct ir_remote *remote,
+ 		 ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_pinsys.h lirc-20100408.patch/daemons/hw_pinsys.h
+--- lirc-20100408/daemons/hw_pinsys.h	2007-07-29 20:20:09.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_pinsys.h	2010-04-09 16:05:14.352327630 +0200
+@@ -14,7 +14,7 @@
+ #ifndef _HW_PINSYS_H
+ #define _HW_PINSYS_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int is_it_is_it_huh(int port);
+ int autodetect(void);
+diff -Naur lirc-20100408/daemons/hw_pixelview.h lirc-20100408.patch/daemons/hw_pixelview.h
+--- lirc-20100408/daemons/hw_pixelview.h	2007-07-29 20:20:09.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_pixelview.h	2010-04-09 16:05:14.366327740 +0200
+@@ -13,7 +13,7 @@
+ #ifndef _HW_PIXELVIEW_H
+ #define _HW_PIXELVIEW_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int pixelview_decode(struct ir_remote *remote,
+ 		     ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_silitek.h lirc-20100408.patch/daemons/hw_silitek.h
+--- lirc-20100408/daemons/hw_silitek.h	2007-07-29 20:20:09.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_silitek.h	2010-04-09 16:05:14.358327986 +0200
+@@ -12,7 +12,7 @@
+ #ifndef _HW_SILITEK_H
+ #define _HW_SILITEK_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int silitek_decode(struct ir_remote *remote,
+ 		   ir_code *prep,ir_code *codep,ir_code *postp,
+diff -Naur lirc-20100408/daemons/hw_slinke.h lirc-20100408.patch/daemons/hw_slinke.h
+--- lirc-20100408/daemons/hw_slinke.h	2007-07-29 20:20:09.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_slinke.h	2010-04-09 16:05:14.360356926 +0200
+@@ -14,7 +14,7 @@
+ #ifndef _HW_SLINKE_H
+ #define _HW_SLINKE_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int slinke_decode(struct ir_remote *remote,
+ 		  ir_code          *prep,
+diff -Naur lirc-20100408/daemons/hw_tira.h lirc-20100408.patch/daemons/hw_tira.h
+--- lirc-20100408/daemons/hw_tira.h	2010-03-20 17:18:30.000000000 +0100
++++ lirc-20100408.patch/daemons/hw_tira.h	2010-04-09 16:05:14.391327119 +0200
+@@ -28,7 +28,7 @@
+ #ifndef HW_TIRA_H
+ #define HW_TIRA_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int     tira_decode                  (struct ir_remote   *remote,
+ 				      ir_code            *prep,
+diff -Naur lirc-20100408/daemons/hw_usbx.h lirc-20100408.patch/daemons/hw_usbx.h
+--- lirc-20100408/daemons/hw_usbx.h	2007-07-29 20:20:12.000000000 +0200
++++ lirc-20100408.patch/daemons/hw_usbx.h	2010-04-09 16:05:14.354327656 +0200
+@@ -23,7 +23,7 @@
+ #ifndef HW_USBX_H
+ #define HW_USBX_H
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ int     usbx_decode                  (struct ir_remote   *remote,
+ 				      ir_code            *prep,
+diff -Naur lirc-20100408/daemons/irrecord.c lirc-20100408.patch/daemons/irrecord.c
+--- lirc-20100408/daemons/irrecord.c	2010-03-20 17:18:30.000000000 +0100
++++ lirc-20100408.patch/daemons/irrecord.c	2010-04-09 16:05:14.387327137 +0200
+@@ -44,7 +44,7 @@
+ #include <signal.h>
+ #include <syslog.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ #include "hardware.h"
+ #include "hw-types.h"
+diff -Naur lirc-20100408/daemons/ir_remote.c lirc-20100408.patch/daemons/ir_remote.c
+--- lirc-20100408/daemons/ir_remote.c	2010-04-02 12:26:57.000000000 +0200
++++ lirc-20100408.patch/daemons/ir_remote.c	2010-04-09 16:05:14.413327192 +0200
+@@ -22,7 +22,7 @@
+ 
+ #include <sys/ioctl.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ #include "lircd.h"
+ #include "ir_remote.h"
+diff -Naur lirc-20100408/daemons/ir_remote.h lirc-20100408.patch/daemons/ir_remote.h
+--- lirc-20100408/daemons/ir_remote.h	2009-05-24 12:46:52.000000000 +0200
++++ lirc-20100408.patch/daemons/ir_remote.h	2010-04-09 16:05:14.398356646 +0200
+@@ -21,7 +21,7 @@
+ #include <math.h>
+ #include <stdlib.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "hardware.h"
+ 
+ #include "ir_remote_types.h"
+diff -Naur lirc-20100408/daemons/ir_remote_types.h lirc-20100408.patch/daemons/ir_remote_types.h
+--- lirc-20100408/daemons/ir_remote_types.h	2010-04-02 12:26:57.000000000 +0200
++++ lirc-20100408.patch/daemons/ir_remote_types.h	2010-04-09 16:05:14.404327809 +0200
+@@ -21,7 +21,7 @@
+ #include <math.h>
+ #include <stdlib.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ #ifdef LONG_IR_CODE
+ typedef unsigned long long ir_code;
+diff -Naur lirc-20100408/drivers/lirc_atiusb/lirc_atiusb.c lirc-20100408.patch/drivers/lirc_atiusb/lirc_atiusb.c
+--- lirc-20100408/drivers/lirc_atiusb/lirc_atiusb.c	2010-03-17 15:16:15.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_atiusb/lirc_atiusb.c	2010-04-09 16:05:14.459351320 +0200
+@@ -65,7 +65,7 @@
+ #include <linux/wait.h>
+ #include <linux/list.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_dev/lirc_dev.c lirc-20100408.patch/drivers/lirc_dev/lirc_dev.c
+--- lirc-20100408/drivers/lirc_dev/lirc_dev.c	2010-03-17 15:16:15.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_dev/lirc_dev.c	2010-04-09 16:05:14.516356068 +0200
+@@ -70,7 +70,7 @@
+ #include <linux/device.h>
+ #endif
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "lirc_dev.h"
+ 
+ static int debug;
+diff -Naur lirc-20100408/drivers/lirc_dev/lirc_dev.h lirc-20100408.patch/drivers/lirc_dev/lirc_dev.h
+--- lirc-20100408/drivers/lirc_dev/lirc_dev.h	2010-01-30 16:01:29.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_dev/lirc_dev.h	2010-04-09 16:05:14.520327275 +0200
+@@ -28,7 +28,7 @@
+ #include <linux/kfifo.h>
+ #endif
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ struct lirc_buffer {
+ 	wait_queue_head_t wait_poll;
+diff -Naur lirc-20100408/drivers/lirc_ene0100/lirc_ene0100.h lirc-20100408.patch/drivers/lirc_ene0100/lirc_ene0100.h
+--- lirc-20100408/drivers/lirc_ene0100/lirc_ene0100.h	2009-08-25 14:27:53.000000000 +0200
++++ lirc-20100408.patch/drivers/lirc_ene0100/lirc_ene0100.h	2010-04-09 16:05:14.447327629 +0200
+@@ -20,7 +20,7 @@
+  */
+ 
+ #include "drivers/kcompat.h"
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+ /* hardware address */
+diff -Naur lirc-20100408/drivers/lirc_igorplugusb/lirc_igorplugusb.c lirc-20100408.patch/drivers/lirc_igorplugusb/lirc_igorplugusb.c
+--- lirc-20100408/drivers/lirc_igorplugusb/lirc_igorplugusb.c	2010-03-17 15:16:15.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_igorplugusb/lirc_igorplugusb.c	2010-04-09 16:05:14.525356846 +0200
+@@ -63,7 +63,7 @@
+ #include <linux/time.h>
+ 
+ #include "drivers/kcompat.h"
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+ #if !defined(KERNEL_2_5)
+diff -Naur lirc-20100408/drivers/lirc_imon/lirc_imon.c lirc-20100408.patch/drivers/lirc_imon/lirc_imon.c
+--- lirc-20100408/drivers/lirc_imon/lirc_imon.c	2010-03-17 15:27:19.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_imon/lirc_imon.c	2010-04-09 16:05:14.500327646 +0200
+@@ -54,7 +54,7 @@
+ #include <linux/timer.h>
+ 
+ #include "drivers/kcompat.h"
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+ 
+diff -Naur lirc-20100408/drivers/lirc_it87/lirc_it87.c lirc-20100408.patch/drivers/lirc_it87/lirc_it87.c
+--- lirc-20100408/drivers/lirc_it87/lirc_it87.c	2010-03-17 15:16:15.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_it87/lirc_it87.c	2010-04-09 16:05:14.467327188 +0200
+@@ -71,7 +71,7 @@
+ #include <linux/timer.h>
+ #include <linux/pnp.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/lirc_dev/lirc_dev.h"
+ #include "drivers/kcompat.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_ite8709/lirc_ite8709.c lirc-20100408.patch/drivers/lirc_ite8709/lirc_ite8709.c
+--- lirc-20100408/drivers/lirc_ite8709/lirc_ite8709.c	2010-01-13 20:56:13.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_ite8709/lirc_ite8709.c	2010-04-09 16:05:14.479327272 +0200
+@@ -31,7 +31,7 @@
+ #include <linux/io.h>
+ #endif
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/lirc_dev/lirc_dev.h"
+ #include "drivers/kcompat.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_mceusb/lirc_mceusb.c lirc-20100408.patch/drivers/lirc_mceusb/lirc_mceusb.c
+--- lirc-20100408/drivers/lirc_mceusb/lirc_mceusb.c	2010-03-31 06:51:02.000000000 +0200
++++ lirc-20100408.patch/drivers/lirc_mceusb/lirc_mceusb.c	2010-04-09 16:05:14.439352599 +0200
+@@ -67,7 +67,7 @@
+ #include <linux/wait.h>
+ #include <linux/time.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_parallel/lirc_parallel.c lirc-20100408.patch/drivers/lirc_parallel/lirc_parallel.c
+--- lirc-20100408/drivers/lirc_parallel/lirc_parallel.c	2010-03-17 15:16:16.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_parallel/lirc_parallel.c	2010-04-09 16:05:14.420351761 +0200
+@@ -70,7 +70,7 @@
+ #include <linux/poll.h>
+ #include <linux/parport.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_sasem/lirc_sasem.c lirc-20100408.patch/drivers/lirc_sasem/lirc_sasem.c
+--- lirc-20100408/drivers/lirc_sasem/lirc_sasem.c	2010-03-17 15:16:16.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_sasem/lirc_sasem.c	2010-04-09 16:05:14.534327175 +0200
+@@ -58,7 +58,7 @@
+ #include <linux/usb.h>
+ 
+ #include "drivers/kcompat.h"
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+ 
+diff -Naur lirc-20100408/drivers/lirc_serial/lirc_serial.c lirc-20100408.patch/drivers/lirc_serial/lirc_serial.c
+--- lirc-20100408/drivers/lirc_serial/lirc_serial.c	2010-03-17 15:16:16.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_serial/lirc_serial.c	2010-04-09 16:05:14.509327239 +0200
+@@ -120,7 +120,7 @@
+ #endif
+ #endif
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_sir/lirc_sir.c lirc-20100408.patch/drivers/lirc_sir/lirc_sir.c
+--- lirc-20100408/drivers/lirc_sir/lirc_sir.c	2010-03-17 15:16:16.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_sir/lirc_sir.c	2010-04-09 16:05:14.429327188 +0200
+@@ -95,7 +95,7 @@
+ 
+ #include <linux/timer.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/lirc_dev/lirc_dev.h"
+ #include "drivers/kcompat.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_streamzap/lirc_streamzap.c lirc-20100408.patch/drivers/lirc_streamzap/lirc_streamzap.c
+--- lirc-20100408/drivers/lirc_streamzap/lirc_streamzap.c	2010-03-17 15:16:16.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_streamzap/lirc_streamzap.c	2010-04-09 16:05:14.486358057 +0200
+@@ -52,7 +52,7 @@
+ #endif
+ #include <linux/usb.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_ttusbir/lirc_ttusbir.c lirc-20100408.patch/drivers/lirc_ttusbir/lirc_ttusbir.c
+--- lirc-20100408/drivers/lirc_ttusbir/lirc_ttusbir.c	2009-03-15 10:34:01.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_ttusbir/lirc_ttusbir.c	2010-04-09 16:05:14.444327695 +0200
+@@ -38,7 +38,7 @@
+ #include <linux/slab.h>
+ #include <linux/usb.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+diff -Naur lirc-20100408/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-20100408.patch/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-20100408/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2010-03-17 15:16:16.000000000 +0100
++++ lirc-20100408.patch/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2010-04-09 16:05:14.475356554 +0200
+@@ -66,7 +66,7 @@
+ #include <linux/platform_device.h>
+ #endif
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h"
+ 
+diff -Naur lirc-20100408/tools/mode2.c lirc-20100408.patch/tools/mode2.c
+--- lirc-20100408/tools/mode2.c	2009-12-28 14:05:30.000000000 +0100
++++ lirc-20100408.patch/tools/mode2.c	2010-04-09 16:05:14.543327535 +0200
+@@ -33,7 +33,7 @@
+ #include <syslog.h>
+ #include <time.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "daemons/ir_remote.h"
+ #include "daemons/hardware.h"
+ #include "daemons/hw-types.h"
+diff -Naur lirc-20100408/tools/smode2.c lirc-20100408.patch/tools/smode2.c
+--- lirc-20100408/tools/smode2.c	2003-03-30 14:26:44.000000000 +0200
++++ lirc-20100408.patch/tools/smode2.c	2010-04-09 16:05:14.546353310 +0200
+@@ -37,7 +37,7 @@
+ #include <vga.h>
+ #include <vgagl.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ 
+ GraphicsContext *screen;
+ GraphicsContext *physicalscreen;
+diff -Naur lirc-20100408/tools/xmode2.c lirc-20100408.patch/tools/xmode2.c
+--- lirc-20100408/tools/xmode2.c	2009-12-27 20:04:10.000000000 +0100
++++ lirc-20100408.patch/tools/xmode2.c	2010-04-09 16:05:14.539352347 +0200
+@@ -60,7 +60,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
+-#include "drivers/lirc.h"
++#include <linux/lirc.h>
+ #include "daemons/ir_remote.h"
+ #include "daemons/hardware.h"
+ #include "daemons/hw-types.h"
diff --git a/packages/sysutils/lirc/url b/packages/sysutils/remote/lirc/url
similarity index 100%
rename from packages/sysutils/lirc/url
rename to packages/sysutils/remote/lirc/url
diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc
index 51f7959a2e..e22781a15e 100755
--- a/tools/mkpkg/mkpkg_xbmc
+++ b/tools/mkpkg/mkpkg_xbmc
@@ -18,13 +18,13 @@ echo "cleaning sources..."
 
 echo "seperating theme..."
   rm -rf xbmc-theme-Confluence-$SVN_REV
-  mv xbmc-$SVN_REV/skin/Confluence xbmc-theme-Confluence-$SVN_REV
+  mv xbmc-$SVN_REV/addons/skin.confluence xbmc-theme-Confluence-$SVN_REV
+  mv xbmc-$SVN_REV/addons/skin.pm3-hd xbmc-theme-PM3-HD-$SVN_REV
 
 echo "cleaning sources..."
-  rm -rf xbmc-$SVN_REV/visualizations/XBMCProjectM/win32
+  rm -rf xbmc-$SVN_REV/visualisations
   rm -rf xbmc-$SVN_REV/lib/libSDL-*
   rm -rf xbmc-$SVN_REV/lib/libcurl-*
-  rm -rf xbmc-$SVN_REV/skin
   rm -rf xbmc-$SVN_REV/project
 
   for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
@@ -40,7 +40,9 @@ echo "cleaning sources..."
 echo "packing sources..."
   tar cvjf xbmc-$SVN_REV.tar.bz2 xbmc-$SVN_REV
   tar cvjf xbmc-theme-Confluence-$SVN_REV.tar.bz2 xbmc-theme-Confluence-$SVN_REV
+  tar cvjf xbmc-theme-PM3-HD-$SVN_REV.tar.bz2 xbmc-theme-PM3-HD-$SVN_REV
 
 echo "remove temporary sourcedir..."
   rm -rf xbmc-$SVN_REV
   rm -rf xbmc-theme-Confluence-$SVN_REV
+  rm -rf xbmc-theme-PM3-HD-$SVN_REV