diff --git a/packages/devel/crossguid/package.mk b/packages/devel/crossguid/package.mk
new file mode 100644
index 0000000000..a8da3b0a1c
--- /dev/null
+++ b/packages/devel/crossguid/package.mk
@@ -0,0 +1,45 @@
+################################################################################
+#      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/>.
+################################################################################
+
+PKG_NAME="crossguid"
+PKG_VERSION="8f399e8"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/graeme-hill/crossguid"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="minimal, cross platform, C++ GUID library"
+PKG_LONGDESC="minimal, cross platform, C++ GUID library"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+  $CXX -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID
+  $AR rvs libcrossguid.a guid.o
+}
+
+makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/lib/
+  cp libcrossguid.a $SYSROOT_PREFIX/usr/lib/
+  mkdir -p $SYSROOT_PREFIX/usr/include/
+  cp guid.h $SYSROOT_PREFIX/usr/include
+}
diff --git a/tools/mkpkg/mkpkg_crossguid b/tools/mkpkg/mkpkg_crossguid
new file mode 100755
index 0000000000..13f2d17ac9
--- /dev/null
+++ b/tools/mkpkg/mkpkg_crossguid
@@ -0,0 +1,43 @@
+#!/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
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d crossguid.git ]; then
+    git clone https://github.com/graeme-hill/crossguid.git -b master crossguid.git
+  fi
+
+  cd crossguid.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf crossguid-$GIT_REV
+  cp -R crossguid.git crossguid-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf crossguid-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf crossguid-$GIT_REV.tar.xz crossguid-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf crossguid-$GIT_REV