diff --git a/devel/Makefile b/devel/Makefile
index 5acfcf55121b..d9b6815629a0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1150,6 +1150,7 @@
     SUBDIR += libconcurrent
     SUBDIR += libconfig
     SUBDIR += libconfuse
+    SUBDIR += libcrossguid
     SUBDIR += libcutl
     SUBDIR += libcwd
     SUBDIR += libcxxrt
diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile
new file mode 100644
index 000000000000..6d36db08731d
--- /dev/null
+++ b/devel/libcrossguid/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME=	libcrossguid
+PORTVERSION=	20150803
+CATEGORIES=	devel
+
+MAINTAINER=	mickael.maillot@gmail.com
+COMMENT=	Minimal and cross platform C++ GUID library
+
+LICENSE=	MIT
+LICENSE_FILES=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	graeme-hill
+GH_PROJECT=	crossguid
+GH_TAGNAME=	8f399e8
+
+USES=		compiler:c++11-lang pkgconfig
+USE_CXXSTD=	c++11
+CXXFLAGS+=	`pkg-config --cflags uuid`
+PLIST_FILES=	include/guid.h lib/libcrossguid.so libdata/pkgconfig/libcrossguid.pc
+
+post-patch:
+	@${SED} -e 's|%PREFIX%|${PREFIX}|g ; s|%VERSION%|${PORTVERSION}|g' \
+		${FILESDIR}/libcrossguid.pc.in > ${WRKDIR}/libcrossguid.pc
+
+do-build:
+	@cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -shared -fPIC guid.cpp -o libcrossguid.so -DGUID_LIBUUID
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/guid.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_LIB} ${WRKSRC}/libcrossguid.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKDIR}/libcrossguid.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+
+.include <bsd.port.mk>
diff --git a/devel/libcrossguid/distinfo b/devel/libcrossguid/distinfo
new file mode 100644
index 000000000000..67b60a85af45
--- /dev/null
+++ b/devel/libcrossguid/distinfo
@@ -0,0 +1,2 @@
+SHA256 (graeme-hill-crossguid-20150803-8f399e8_GH0.tar.gz) = 929397adfe57b945c5153e09f1e0bc1763300e2b30578ec7ed6facc2821d7f6f
+SIZE (graeme-hill-crossguid-20150803-8f399e8_GH0.tar.gz) = 46576
diff --git a/devel/libcrossguid/files/libcrossguid.pc.in b/devel/libcrossguid/files/libcrossguid.pc.in
new file mode 100644
index 000000000000..16e371bc2606
--- /dev/null
+++ b/devel/libcrossguid/files/libcrossguid.pc.in
@@ -0,0 +1,10 @@
+prefix=%PREFIX%
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libguid
+Description: minimal and cross platform C++ GUID library
+Version: %VERSION%
+Libs: -L${libdir} -lguid
+Cflags: -I${includedir}
+
diff --git a/devel/libcrossguid/pkg-descr b/devel/libcrossguid/pkg-descr
new file mode 100644
index 000000000000..be05012908a3
--- /dev/null
+++ b/devel/libcrossguid/pkg-descr
@@ -0,0 +1,5 @@
+CrossGuid is a minimal, cross platform, C++ GUID library.
+It uses the best native GUID/UUID generator on the given platform
+and had a generic class for parsing, stringifying, and comparing IDs.
+
+WWW: https://github.com/graeme-hill/crossguid