diff --git a/packages/multimedia/crystalhd/build b/packages/multimedia/crystalhd/build
index 3c214a7b71..9c3d52f4fd 100755
--- a/packages/multimedia/crystalhd/build
+++ b/packages/multimedia/crystalhd/build
@@ -13,7 +13,8 @@ cd $PKG_BUILD/driver/linux
 
 make V=1
 
-cd $PKG_BUILD/linux_lib/libcrystalhd
+
+cd ../../linux_lib/libcrystalhd
 
 make BCGCC=$TARGET_CXX
 
diff --git a/packages/multimedia/crystalhd/install b/packages/multimedia/crystalhd/install
index abffff1ef9..382a38420f 100755
--- a/packages/multimedia/crystalhd/install
+++ b/packages/multimedia/crystalhd/install
@@ -2,6 +2,10 @@
 
 . config/options $1
 
+$SCRIPTS/build busybox-hosttools
+
+VER=`ls $BUILD/linux*/modules/lib/modules`
+
 mkdir -p $INSTALL/lib/firmware
   cp $PKG_BUILD/firmware/fwbin/*/*.bin $INSTALL/lib/firmware
 
@@ -10,3 +14,15 @@ mkdir -p $INSTALL/usr/lib
 
 mkdir -p $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/driver/linux/*.rules $INSTALL/lib/udev/rules.d
+
+mkdir -p $INSTALL/lib/modules/$VER/crystalhd
+  cp $PKG_BUILD/driver/linux/crystalhd.ko $INSTALL/lib/modules/$VER/crystalhd
+
+  for MOD in `find $INSTALL/lib/modules/$VER/crystalhd -name *.ko`; do
+    $STRIP --strip-debug $MOD
+  done
+
+  $ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
+  for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
+    rm -f $i
+  done
diff --git a/packages/multimedia/crystalhd/need_unpack b/packages/multimedia/crystalhd/need_unpack
new file mode 100755
index 0000000000..bfae889a4c
--- /dev/null
+++ b/packages/multimedia/crystalhd/need_unpack
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. config/options $1
+
+STAMP=$STAMPS/$1/unpack
+
+test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
+     $PKG_DIR/config/linux.$TARGET_PLATFORM.conf -nt $STAMP -o \
+     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
+     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_PLATFORM.conf -nt $STAMP -o \
+     $PKG_DIR/url -nt $STAMP && rm -f $STAMP
+
+exit 0
diff --git a/packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl.diff b/packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl-0.2.1.diff
similarity index 93%
rename from packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl.diff
rename to packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl-0.2.1.diff
index f85dbb83d0..f62bb485be 100644
--- a/packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl.diff
+++ b/packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl-0.2.1.diff
@@ -1,6 +1,6 @@
 diff -Naur crystalhd-3.8.0/driver/linux/crystalhd_flea_ddr.c crystalhd-3.8.0.patch/driver/linux/crystalhd_flea_ddr.c
 --- crystalhd-3.8.0/driver/linux/crystalhd_flea_ddr.c	2010-10-06 00:07:16.000000000 +0200
-+++ crystalhd-3.8.0.patch/driver/linux/crystalhd_flea_ddr.c	2010-10-06 01:04:11.844215460 +0200
++++ crystalhd-3.8.0.patch/driver/linux/crystalhd_flea_ddr.c	2010-10-06 02:09:53.349322695 +0200
 @@ -24,6 +24,7 @@
   * along with this driver.  If not, see <http://www.gnu.org/licenses/>.
   **********************************************************************/
@@ -11,7 +11,7 @@ diff -Naur crystalhd-3.8.0/driver/linux/crystalhd_flea_ddr.c crystalhd-3.8.0.pat
  
 diff -Naur crystalhd-3.8.0/driver/linux/crystalhd_lnx.c crystalhd-3.8.0.patch/driver/linux/crystalhd_lnx.c
 --- crystalhd-3.8.0/driver/linux/crystalhd_lnx.c	2010-10-06 00:07:16.000000000 +0200
-+++ crystalhd-3.8.0.patch/driver/linux/crystalhd_lnx.c	2010-10-06 01:04:31.543484731 +0200
++++ crystalhd-3.8.0.patch/driver/linux/crystalhd_lnx.c	2010-10-06 02:09:59.370398969 +0200
 @@ -279,8 +279,13 @@
  }
  
@@ -20,7 +20,7 @@ diff -Naur crystalhd-3.8.0/driver/linux/crystalhd_lnx.c crystalhd-3.8.0.patch/dr
  static int chd_dec_ioctl(struct inode *in, struct file *fd,
  			 unsigned int cmd, unsigned long ua)
 +#else
-+static long irctl_ioctl(struct file *file,
++static long chd_dec_ioctl(struct file *fd,
 +			 unsigned int cmd, unsigned long ua)
 +#endif
  {