diff --git a/packages/debug/mrxvt/build b/packages/debug/mrxvt/build
deleted file mode 100755
index 0dd3dcce22..0000000000
--- a/packages/debug/mrxvt/build
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-ac_cv_func_setpgrp_void=no \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-minimal \
-            --disable-frills \
-            --enable-keepscrolling \
-            --disable-selectionscrolling \
-            --enable-mousewheel \
-            --disable-mouseslipwheel \
-            --enable-rxvt-scroll \
-            --disable-half-shadow \
-            --enable-lastlog \
-            --enable-sessionmgr \
-            --enable-linespace \
-            --enable-24bits \
-            --enable-256colors \
-            --enable-cursor-blink \
-            --enable-pointer-blank \
-            --disable-text-shadow \
-            --enable-menubar \
-            --disable-transparency \
-            --disable-tinting \
-            --enable-xrender \
-            --disable-xpm \
-            --disable-jpeg \
-            --disable-png \
-            --enable-xft \
-            --enable-ttygid \
-            --enable-backspace-key \
-            --enable-delete-key \
-            --disable-resources \
-            --disable-swapscreen
-
-#            --x-includes=$SYSROOT_PREFIX/usr/include \
-#            --x-libraries=$SYSROOT_PREFIX/usr/lib \
-
-make
-
-$STRIP src/$1
diff --git a/packages/debug/mrxvt/install b/packages/debug/mrxvt/install
deleted file mode 100755
index e0a84222ed..0000000000
--- a/packages/debug/mrxvt/install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options
-
-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_DIR/scripts/$1-session $INSTALL/usr/bin
-  cp -P $PKG_BUILD/src/$1 $INSTALL/usr/bin
-
diff --git a/packages/debug/mrxvt/meta b/packages/debug/mrxvt/package.mk
similarity index 53%
rename from packages/debug/mrxvt/meta
rename to packages/debug/mrxvt/package.mk
index b4dff10d4f..a4f46073fd 100644
--- a/packages/debug/mrxvt/meta
+++ b/packages/debug/mrxvt/package.mk
@@ -26,11 +26,42 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://materm.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/materm/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="libX11 libXrender freetype"
-PKG_BUILD_DEPENDS="toolchain libX11 libXrender freetype"
+PKG_BUILD_DEPENDS_TARGET="toolchain libX11 libXrender freetype"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"
 PKG_SHORTDESC="mrxvt: Lightweight Xterm replacement"
 PKG_LONGDESC="Mrxvt (previously named as materm) is a lightweight and powerful multi-tabbed X terminal emulator based on the popular rxvt and aterm. It implements many useful features seen in some modern X terminal emulators, like gnome-terminal and konsole, but keep to be lightweight and independent from the GNOME and KDE desktop environment."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_setpgrp_void=no \
+                           --enable-minimal \
+                           --disable-frills \
+                           --enable-keepscrolling \
+                           --disable-selectionscrolling \
+                           --enable-mousewheel \
+                           --disable-mouseslipwheel \
+                           --enable-rxvt-scroll \
+                           --disable-half-shadow \
+                           --enable-lastlog \
+                           --enable-sessionmgr \
+                           --enable-linespace \
+                           --enable-24bits \
+                           --enable-256colors \
+                           --enable-cursor-blink \
+                           --enable-pointer-blank \
+                           --disable-text-shadow \
+                           --enable-menubar \
+                           --disable-transparency \
+                           --disable-tinting \
+                           --enable-xrender \
+                           --disable-xpm \
+                           --disable-jpeg \
+                           --disable-png \
+                           --enable-xft \
+                           --enable-ttygid \
+                           --enable-backspace-key \
+                           --enable-delete-key \
+                           --disable-resources \
+                           --disable-swapscreen"
diff --git a/packages/debug/mrxvt/profile.d/52-terminal.conf b/packages/debug/mrxvt/profile.d/52-terminal.conf
deleted file mode 100644
index 4174bef2b9..0000000000
--- a/packages/debug/mrxvt/profile.d/52-terminal.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-# Core (PATH) environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-TERMINAL="/usr/bin/mrxvt-session"
-
-export TERMINAL
diff --git a/packages/debug/mrxvt/scripts/mrxvt-session b/packages/debug/mrxvt/scripts/mrxvt-session
deleted file mode 100755
index 51e940fba2..0000000000
--- a/packages/debug/mrxvt/scripts/mrxvt-session
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. /etc/profile
-
-# start Windowmanager by default
-  $WINDOWMANAGER -term mrxvt &
-
-# start terminal
-  mrxvt