diff --git a/Makefile b/Makefile
index c1cee4e0d01ad73aef665eb2375dd1283e46cd97..0d429ed9aae7eebacadbbee11dc6f35169d3efc4 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ SUBDIR+=	kukaFri-libs
 SUBDIR+=	lastwave
 SUBDIR+=	libANN
 SUBDIR+=	libfreenect
+SUBDIR+=	libhatp
 SUBDIR+=	libmove3d
 SUBDIR+=	lwr-genom
 SUBDIR+=	metapod
diff --git a/libhatp/DESCR b/libhatp/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..d3a1b336f3e53565ae47c4eb9c0b254233a60c65
--- /dev/null
+++ b/libhatp/DESCR
@@ -0,0 +1,5 @@
+libhatp is library that helps in HATP plan handling.
+
+It provide tools to handle a plan generated with HATP. It includes a parser
+that build a plan from a string (the one returned by HATP as answer to a 
+plan request). 
diff --git a/libhatp/Makefile b/libhatp/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..1582766600bfebe16289fd1ac37778ee4c9813b4
--- /dev/null
+++ b/libhatp/Makefile
@@ -0,0 +1,22 @@
+# robotpkg Makefile for:	planning/libhatp
+# Created:			Raphaël Lallement, 18/01/2013
+#
+
+DISTNAME=		libhatp-${VERSION}
+VERSION=		1.0.0
+PKGREVISION=
+CATEGORIES=		planning
+MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=libhatp/}
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_OPENROBOTS}libhatp
+
+
+MAINTAINER=		raphael.lallement@laas.fr
+COMMENT=		Library to handle HATP plans
+LICENSE=		2-clause-bsd
+
+MAKE_JOBS_SAFE=		yes
+
+include ../../mk/sysdep/cmake.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/robotpkg.mk
diff --git a/libhatp/PLIST b/libhatp/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..b06b5dfa65ab3d5a215f132f75d70fab2ec83c4d
--- /dev/null
+++ b/libhatp/PLIST
@@ -0,0 +1,11 @@
+@comment Sat Jan 19 01:02:50 CET 2013
+include/libhatp/hatpLexer.hh
+include/libhatp/hatpNode.hh
+include/libhatp/hatpPlan.hh
+include/libhatp/hatpStreams.hh
+include/libhatp/hatpTaskList.hh
+include/libhatp/hatpTools.hh
+include/libhatp/hatpTree.hh
+lib/liblibhatp.so
+lib/liblibhatp.so.${PKGVERSION}
+lib/pkgconfig/libhatp.pc
diff --git a/libhatp/depend.mk b/libhatp/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..c52372ebc3fa901470f7a0486568d031fcb7fbac
--- /dev/null
+++ b/libhatp/depend.mk
@@ -0,0 +1,27 @@
+# robotpkg depend.mk for:	planning/libhatp
+# Created:			Raphaël Lallement, 18/01/2013
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+LIBHATP_DEPEND_MK:=${LIBHATP_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		libhatp
+endif
+
+ifeq (+,$(LIBHATP_DEPEND_MK))
+PREFER.libhatp?=	robotpkg
+
+DEPEND_USE+=		libhatp
+
+DEPEND_ABI.libhatp?=	libhatp>=1.0.0
+DEPEND_DIR.libhatp?=	../../wip/libhatp
+
+SYSTEM_SEARCH.libhatp=\
+	include/libhatp/hatpPlan.hh \
+	lib/liblibhatp.so \
+	lib/pkgconfig/libhatp.pc
+endif
+
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/libhatp/distinfo b/libhatp/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..9460ab07d9855671ae2bdb72a9ce724cef42e16a
--- /dev/null
+++ b/libhatp/distinfo
@@ -0,0 +1,3 @@
+SHA1 (libhatp-1.0.0.tar.gz) = 2a0b60339deebf16f43566dba54baa118b9e5bf1
+RMD160 (libhatp-1.0.0.tar.gz) = e4606295429a1e31129c3802f9731ff59c0ddb1a
+Size (libhatp-1.0.0.tar.gz) = 33680 bytes