diff --git a/Makefile b/Makefile
index 1db24c92063b9bfc74b6f501edb5838b7c9245c8..1679d562f09d3383030462b14d713cae7ca6030e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ SUBDIR+= 	atlaas
 SUBDIR+= 	atlaas-genom
 SUBDIR+=	attentional-genom
 SUBDIR+= 	certi
+SUBDIR+=	chilitags
 SUBDIR+= 	clara
 SUBDIR+=	daqflex-libs
 SUBDIR+= 	demo-genom3
diff --git a/chilitags/DESCR b/chilitags/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..565847680244c33d1a4c6ba325cadb31e5a465a2
--- /dev/null
+++ b/chilitags/DESCR
@@ -0,0 +1,11 @@
+Chilitags is a C++ cross-platform software library for the detection and
+identification of 2D fiducial markers.  They are to be printed and placed on
+objects from the real world, to form the basis or Augmented Reality (AR)
+applications. Using a camera, the position of the tagged objects can be
+acquired by a computer and used to virtually display information on them.
+
+Chilitags was developed internally for projects of the CHILI lab
+(Computer-Human Interaction in Learning and Instruction, formerly CRAFT) at
+EPFL, such as Metroscope or TapaCarp. There are already many alternatives (e.g.
+ARToolKit, or reacTIVision, among many others), but we decided to release
+Chilitags anyway, as there seemed to be a demand for it.
diff --git a/chilitags/Makefile b/chilitags/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a4121cb86b61925639fe378c637af4e7cd06932b
--- /dev/null
+++ b/chilitags/Makefile
@@ -0,0 +1,24 @@
+# robotpkg Makefile for:	image/chilitags
+# Created:			Séverin Lemaignan on Fri, 13 Dec 2013
+#
+
+VERSION=	1.3.0
+DISTNAME=	chilitags-${VERSION}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=chili-epfl/chilitags/archive/${VERSION}${EXTRACT_SUFX}?f=}
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}/chili-epfl/chilitags
+
+CATEGORIES=		image
+MAINTAINER=		severin.lemaignan@epfl.ch
+LICENSE=		gnu-lgpl-v3
+HOMEPAGE=		https://github.com/chili-epfl/chilitags
+COMMENT=		Robust Fiducial Markers for Augmented Reality
+
+CMAKE_ARGS+=	-DWITH_CREATOR=ON
+CMAKE_ARGS+=	-DWITH_DETECTOR=ON
+CMAKE_ARGS+=	-DWITH_SAMPLES=ON
+
+include ../../image/opencv/depend.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/sysdep/cmake.mk
+include ../../mk/robotpkg.mk
diff --git a/chilitags/PLIST b/chilitags/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..12441386239f8befc8469f920b9c475f89190433
--- /dev/null
+++ b/chilitags/PLIST
@@ -0,0 +1,16 @@
+@comment Fri Dec 13 10:27:20 CET 2013
+bin/chilitags-creator
+bin/chilitags-detect
+bin/chilitags-detector
+bin/objects
+include/chilitags/Chilitag.hpp
+include/chilitags/Codec.hpp
+include/chilitags/DetectChilitags.hpp
+include/chilitags/Estimator.hpp
+include/chilitags/ObjectConfig.hpp
+include/chilitags/Objects.hpp
+include/chilitags/Quad.hpp
+include/chilitags/Registrar.hpp
+include/chilitags/TagDrawer.hpp
+lib/libchilitags.so
+lib/pkgconfig/chilitags.pc
diff --git a/chilitags/depend.mk b/chilitags/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..5260c99b32decfb8a0412e3a5070cd9ae025ec90
--- /dev/null
+++ b/chilitags/depend.mk
@@ -0,0 +1,30 @@
+# robotpkg depend.mk for:	image/chilitags
+# Created:					Séverin Lemaignan on Fri, 13 Dec 2013
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+CHILITAGS_DEPEND_MK:=	${CHILITAGS_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		chilitags
+endif
+
+ifeq (+,$(CHILITAGS_DEPEND_MK)) # ---------------------------------------------
+
+PREFER.chilitags?=		robotpkg
+
+SYSTEM_SEARCH.chilitags=\
+	include/chilitags/DetectChilitags.hpp	\
+	include/chilitags/Objects.hpp			\
+	bin/chilitags-detect					\
+	lib/libchilitags.so						\
+	'lib/pkgconfig/chilitags.pc:/Version/s/[^0-9.]//gp'
+
+DEPEND_USE+=		chilitags
+
+DEPEND_ABI.chilitags?=	chilitags>=1.3
+DEPEND_DIR.chilitags?=	../../wip/chilitags
+
+endif # CHILITAGS_DEPEND_MK ---------------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/chilitags/distinfo b/chilitags/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..e8e51504f8b9dc19547c876b36ac150416416597
--- /dev/null
+++ b/chilitags/distinfo
@@ -0,0 +1,3 @@
+SHA1 (chilitags-1.3.0.tar.gz) = 2c92beb9a9a6f2cad039c9eb402b7780e7190a94
+RMD160 (chilitags-1.3.0.tar.gz) = 58df2d00848036daf14d98f49ebd388f9694b0c9
+Size (chilitags-1.3.0.tar.gz) = 127448 bytes