diff --git a/packages/sysutils/remote/lirc/build b/packages/sysutils/remote/lirc/build
deleted file mode 100755
index 447bac6d1f..0000000000
--- a/packages/sysutils/remote/lirc/build
+++ /dev/null
@@ -1,50 +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 <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-if [ "$DEBUG" = yes ]; then
-  DEBUG_CONFIG="--enable-debug"
-else
-  DEBUG_CONFIG="--disable-debug"
-fi
-
-export ac_cv_path_LIBUSB_CONFIG=
-export ac_cv_func_forkpty=no
-export ac_cv_lib_util_forkpty=no
-export MAKEFLAGS=-j1
-
-cd $PKG_BUILD
-mkdir -p m4 && do_autoreconf
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-shared \
-            --disable-static \
-            --enable-sandboxed \
-            --with-gnu-ld \
-            --without-x \
-            --with-driver=userspace \
-            --with-syslog=LOG_DAEMON \
-            --with-kerneldir=$(kernel_path) \
-            $DEBUG_CONFIG
-
-make
diff --git a/packages/sysutils/remote/lirc/install b/packages/sysutils/remote/lirc/install
deleted file mode 100755
index 12146884df..0000000000
--- a/packages/sysutils/remote/lirc/install
+++ /dev/null
@@ -1,42 +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 <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/daemons/lircd $INSTALL/usr/sbin
-  cp $PKG_BUILD/daemons/lircmd $INSTALL/usr/sbin # do we need this?
-
-mkdir -p $INSTALL/etc/lirc
-  cp $PKG_DIR/config/lircd.conf.xbox $INSTALL/etc/lirc
-  cp $PKG_DIR/config/lircd.conf.rpi $INSTALL/etc/lirc
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/.libs/ircat $INSTALL/usr/bin # do we need this?
-  cp $PKG_BUILD/tools/.libs/irexec $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/.libs/irpty $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/.libs/lircrcd $INSTALL/usr/bin # do we need this?
-  cp $PKG_BUILD/tools/irsend $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/irw $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/mode2 $INSTALL/usr/bin
-  cp $PKG_BUILD/daemons/irrecord $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/tools/.libs/liblirc_client.so* $INSTALL/usr/lib
diff --git a/packages/sysutils/remote/lirc/meta b/packages/sysutils/remote/lirc/package.mk
similarity index 60%
rename from packages/sysutils/remote/lirc/meta
rename to packages/sysutils/remote/lirc/package.mk
index 0dc70eb65d..51d0df9fdd 100644
--- a/packages/sysutils/remote/lirc/meta
+++ b/packages/sysutils/remote/lirc/package.mk
@@ -24,11 +24,38 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.lirc.org"
 PKG_URL="$SOURCEFORGE_SRC/lirc/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libusb-compat"
-PKG_BUILD_DEPENDS="toolchain libftdi libusb-compat"
+PKG_BUILD_DEPENDS_TARGET="toolchain libftdi libusb-compat"
 PKG_PRIORITY="optional"
 PKG_SECTION="sysutils/remote"
 PKG_SHORTDESC="lirc: Linux Infrared Remote Control"
 PKG_LONGDESC="LIRC is a package that allows you to decode and send infra-red signals of many (but not all) commonly used remote controls."
-PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_LIBUSB_CONFIG= /
+                           ac_cv_func_forkpty=no \
+                           ac_cv_lib_util_forkpty=no \
+                           --enable-sandboxed \
+                           --with-gnu-ld \
+                           --without-x \
+                           --with-driver=userspace \
+                           --with-syslog=LOG_DAEMON"
+
+if [ "$DEBUG" = yes ]; then
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-debug"
+else
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-debug"
+fi
+
+pre_make_target() {
+  export MAKEFLAGS=-j1
+}
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin/pronto2lirc
+
+  mkdir -p $INSTALL/etc/lirc
+    cp $PKG_DIR/config/lircd.conf.xbox $INSTALL/etc/lirc
+    cp $PKG_DIR/config/lircd.conf.rpi $INSTALL/etc/lirc
+}