diff --git a/packages/linux-drivers/tbs-linux-drivers/build b/packages/linux-drivers/tbs-linux-drivers/build
deleted file mode 100755
index 123b626a63..0000000000
--- a/packages/linux-drivers/tbs-linux-drivers/build
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-. config/options $1
-
-cd $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers
-
-[ "$TARGET_ARCH" = "i386" ] && ./v4l/tbs-x86_r3.sh
-[ "$TARGET_ARCH" = "x86_64" ] && ./v4l/tbs-x86_64.sh
-
-LDFLAGS="" make DIR=$(kernel_path) prepare
-
-# TODO: removee me after 3 or 4 tbs driver versions
-#for cfg in CONFIG_VIDEO_SH_MOBILE_CEU CONFIG_VIDEO_SH_MOBILE_CSI2 ; do
-# sed -i -e "s|^$cfg=.*$|# $cfg is not set|" v4l/.config
-#done
-
-LDFLAGS="" make DIR=$(kernel_path)
diff --git a/packages/linux-drivers/tbs-linux-drivers/install b/packages/linux-drivers/tbs-linux-drivers/install
deleted file mode 100755
index 6411a20c83..0000000000
--- a/packages/linux-drivers/tbs-linux-drivers/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/lib/modules/$(get_module_dir)/updates/tbs
-find $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$(get_module_dir)/updates/tbs \;
-
-mkdir -p $INSTALL/lib/firmware/
-cp $BUILD/${PKG_NAME}-${PKG_VERSION}/*.fw $INSTALL/lib/firmware/
diff --git a/packages/linux-drivers/tbs-linux-drivers/meta b/packages/linux-drivers/tbs-linux-drivers/package.mk
similarity index 61%
rename from packages/linux-drivers/tbs-linux-drivers/meta
rename to packages/linux-drivers/tbs-linux-drivers/package.mk
index cdb96585e8..30e2a08c40 100644
--- a/packages/linux-drivers/tbs-linux-drivers/meta
+++ b/packages/linux-drivers/tbs-linux-drivers/package.mk
@@ -17,14 +17,15 @@
################################################################################
PKG_NAME="tbs-linux-drivers"
-PKG_VERSION="130802"
+PKG_VERSION="140113"
PKG_REV="1"
-PKG_ARCH="any"
+PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tbsdtv.com/english/Download.html"
PKG_URL="http://www.tbsdtv.com/download/document/common/tbs-linux-drivers_v${PKG_VERSION}.zip"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux"
+PKG_SOURCE_DIR="$PKG_NAME"
+PKG_DEPENDS_TARGET=""
+PKG_BUILD_DEPENDS_TARGET="toolchain linux"
PKG_NEED_UNPACK="$LINUX_DEPENDS"
PKG_PRIORITY="optional"
PKG_SECTION="driver"
@@ -32,3 +33,23 @@ PKG_SHORTDESC="Linux TBS tuner drivers"
PKG_LONGDESC="Linux TBS tuner drivers"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
+
+post_unpack() {
+ tar xjf $ROOT/$PKG_BUILD/linux-tbs-drivers.tar.bz2 -C $ROOT/$PKG_BUILD
+ chmod -R u+rwX $ROOT/$PKG_BUILD/linux-tbs-drivers/*
+}
+
+make_target() {
+ cd $ROOT/$PKG_BUILD/linux-tbs-drivers
+ [ "$TARGET_ARCH" = "i386" ] && ./v4l/tbs-x86_r3.sh
+ [ "$TARGET_ARCH" = "x86_64" ] && ./v4l/tbs-x86_64.sh
+ LDFLAGS="" make DIR=$(kernel_path) prepare
+ LDFLAGS="" make DIR=$(kernel_path)
+}
+
+makeinstall_target() {
+ mkdir -p $INSTALL/lib/modules/$(get_module_dir)/updates/tbs
+ find $ROOT/$PKG_BUILD/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$(get_module_dir)/updates/tbs \;
+ mkdir -p $INSTALL/lib/firmware/
+ cp $ROOT/$PKG_BUILD/*.fw $INSTALL/lib/firmware/
+}
diff --git a/packages/linux-drivers/tbs-linux-drivers/unpack b/packages/linux-drivers/tbs-linux-drivers/unpack
deleted file mode 100755
index 9b827c1d2a..0000000000
--- a/packages/linux-drivers/tbs-linux-drivers/unpack
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
-
-. config/options $1
-
-ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
-
-mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
-
-# unzip main archive
-unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
-# extract .tar.bz2
-tar xjf $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers.tar.bz2 -C $BUILD/${PKG_NAME}-${PKG_VERSION}
-# fix permissions
-chmod -R u+rwX $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/*