diff --git a/packages/network/libshairplay/build b/packages/network/libshairplay/build
new file mode 100755
index 0000000000..ae4137cbc6
--- /dev/null
+++ b/packages/network/libshairplay/build
@@ -0,0 +1,35 @@
+#!/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
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared \
+
+make
+
+$MAKEINSTALL
diff --git a/packages/network/libshairplay/install b/packages/network/libshairplay/install
new file mode 100755
index 0000000000..a85f4d7549
--- /dev/null
+++ b/packages/network/libshairplay/install
@@ -0,0 +1,29 @@
+#!/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
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/etc/shairplay
+  cp -P $PKG_BUILD/airport.key $INSTALL/etc/shairplay
diff --git a/packages/network/libshairplay/meta b/packages/network/libshairplay/meta
new file mode 100644
index 0000000000..8aa5a232a0
--- /dev/null
+++ b/packages/network/libshairplay/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      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
+################################################################################
+
+PKG_NAME="libshairplay"
+PKG_VERSION="89202f7"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/juhovh/shairplay"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="libshairplay: emulates AirPort Express"
+PKG_LONGDESC="libshairPlay emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
diff --git a/packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch b/packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch
new file mode 100644
index 0000000000..0658d8f83f
--- /dev/null
+++ b/packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch
@@ -0,0 +1,17 @@
+--- shairplay-0.9.0.orig/src/shairplay.c
++++ shairplay-0.9.0/src/shairplay.c
+@@ -313,8 +313,11 @@ main(int argc, char *argv[])
+ 
+ 	raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL);
+ 	if (raop == NULL) {
+-		fprintf(stderr, "Could not initialize the RAOP service\n");
+-		return -1;
++		raop = raop_init_from_keyfile(10, &raop_cbs, "/etc/shairplay/airport.key", NULL);
++		if (raop == NULL) {
++			fprintf(stderr, "Could not initialize the RAOP service\n");
++			return -1;
++		}
+ 	}
+ 
+ 	if (strlen(options.password)) {
+
diff --git a/tools/mkpkg/mkpkg_libshairplay b/tools/mkpkg/mkpkg_libshairplay
new file mode 100755
index 0000000000..53ffe50ae0
--- /dev/null
+++ b/tools/mkpkg/mkpkg_libshairplay
@@ -0,0 +1,51 @@
+#!/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
+################################################################################
+
+PKG_NAME="libshairplay"
+PKG_VERSION=""
+GIT_REPO="https://github.com/juhovh/shairplay.git"
+DEST_DIR="$PKG_NAME"
+
+echo "getting sources..."
+  if [ ! -d $DEST_DIR.git ]; then
+    git clone $GIT_REPO $DEST_DIR.git
+  fi
+
+  cd $DEST_DIR.git
+    git pull
+
+    echo "getting version..."
+    PKG_VERSION=`git log -n1 --format=%h`
+    echo $GIT_REV
+  cd ..
+
+echo "copying sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION
+  cp -R $DEST_DIR.git $PKG_NAME-$PKG_VERSION
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION/.git
+
+echo "packing sources..."
+  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
+
+echo "remove temporary sourcedir..."
+  rm -rf $PKG_NAME-$PKG_VERSION