diff --git a/packages/devel/crossguid/package.mk b/packages/devel/crossguid/package.mk
index cb08fe613d..65588fe428 100644
--- a/packages/devel/crossguid/package.mk
+++ b/packages/devel/crossguid/package.mk
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="crossguid"
-PKG_VERSION="8f399e8bd4252be9952f3dfa8199924cc8487ca4"
-PKG_SHA256="022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99"
+PKG_VERSION="ca1bf4b810e2d188d04cb6286f957008ee1b7681" # 2019-05-30
+PKG_SHA256="6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/graeme-hill/crossguid"
 PKG_URL="https://github.com/graeme-hill/crossguid/archive/${PKG_VERSION}.tar.gz"
@@ -12,7 +13,7 @@ PKG_LONGDESC="minimal, cross platform, C++ GUID library"
 PKG_TOOLCHAIN="manual"
 
 make_target() {
-  ${CXX} -c guid.cpp -o guid.o ${CXXFLAGS} -std=c++11 -DGUID_LIBUUID
+  ${CXX} -c ../src/guid.cpp -o guid.o ${CXXFLAGS} -I../include --std=c++17 -DGUID_LIBUUID
   ${AR} rvs libcrossguid.a guid.o
 }
 
@@ -20,5 +21,5 @@ 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
+  cp ../include/crossguid/guid.hpp ${SYSROOT_PREFIX}/usr/include
 }