diff --git a/common/shlibs b/common/shlibs
index 49e9dec354..840244ec4d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -969,6 +969,8 @@ libudisks2.so.0 udisks2-1.93.0_1
 libgcr-base-3.so.1 gcr-3.3.92_1
 libgck-1.so.0 gcr-3.8.0_1
 libgcr-ui-3.so.1 gcr-3.8.0_1
+libcld2.so cld2-0.0.1.20150821_1
+libcld2_full.so cld2-full-0.0.1.20150821_1
 libwacom.so.2 libwacom-0.3_1
 libfarstream-0.2.so.5 farstream-0.2.7_1
 libass.so.9 libass-0.13.6_1
diff --git a/srcpkgs/cld2-devel b/srcpkgs/cld2-devel
new file mode 120000
index 0000000000..3892eb351a
--- /dev/null
+++ b/srcpkgs/cld2-devel
@@ -0,0 +1 @@
+cld2
\ No newline at end of file
diff --git a/srcpkgs/cld2-full b/srcpkgs/cld2-full
new file mode 120000
index 0000000000..3892eb351a
--- /dev/null
+++ b/srcpkgs/cld2-full
@@ -0,0 +1 @@
+cld2
\ No newline at end of file
diff --git a/srcpkgs/cld2/template b/srcpkgs/cld2/template
new file mode 100644
index 0000000000..5c7b638f29
--- /dev/null
+++ b/srcpkgs/cld2/template
@@ -0,0 +1,56 @@
+# Template file for 'cld2'
+pkgname=cld2
+version=0.0.1.20150821
+revision=1
+_gitrev=b56fa78a2fe44ac2851bae5bf4f4693a0644da7b
+wrksrc="${pkgname}-${_gitrev}"
+short_desc="Compact Language Detector 2"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="Apache-2.0"
+homepage="https://github.com/CLD2Owners/cld2"
+distfiles="https://github.com/CLD2Owners/cld2/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=2bd0f8aa344698c0ce6b2c89f5540af10e69e92d4c74f9fe66ffe25281be1111
+
+CXXFLAGS="-Wno-narrowing"
+
+do_configure() {
+	:
+}
+
+do_build() {
+	cd internal
+	sed -i compile_libs.sh -e "s;^g++;$CXX;"
+	./compile_libs.sh CFLAGS= CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"
+}
+
+do_install() {
+	local f
+	vmkdir usr/include/cld2/internal
+	vmkdir usr/include/cld2/public
+	for f in internal/*.h; do
+		vinstall ${f} 644 usr/include/cld2/internal
+	done
+	for f in public/*.h; do
+		vinstall ${f} 644 usr/include/cld2/public
+	done
+	vmkdir usr/lib
+	vinstall internal/libcld2.so 755 usr/lib
+	vinstall internal/libcld2_full.so 755 usr/lib
+	vdoc README.md
+}
+
+cld2-full_package() {
+	short_desc+=" - full detection"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/libcld2_full.so
+	}
+}
+
+cld2-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}-full>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+	}
+}