diff --git a/libpointmatcher/DESCR b/libpointmatcher/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..31ffedbc41d9cecd416d8d914274dc2ae8a8b729
--- /dev/null
+++ b/libpointmatcher/DESCR
@@ -0,0 +1 @@
+An "Iterative Closest Point" library for 2-D/3-D mapping in robotic
diff --git a/libpointmatcher/Makefile b/libpointmatcher/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..14e6423f8a9c8371ecd28e818c9f54ed1443a38c
--- /dev/null
+++ b/libpointmatcher/Makefile
@@ -0,0 +1,29 @@
+# robotpkg depend.mk for:	mapping/libpointmatcher
+# Created:			Pierrick Koch on Thu, 27 Mar 2014
+#
+NAME=			libpointmatcher
+VERSION=		1.1.0
+GITHUB_USER=		ethz-asl
+CATEGORIES=		mapping
+
+DISTNAME=		${NAME}-${VERSION}
+DISTBASE=		${GITHUB_USER}/${NAME}/archive/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=${DISTBASE}${VERSION}${EXTRACT_SUFX}?f=}
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}/${GITHUB_USER}/${NAME}.git
+
+MAINTAINER=		pierrick.koch@laas.fr
+COMMENT=		An "Iterative Closest Point" library for 2-D/3-D mapping in robotic
+LICENSE=		2-clause-bsd
+
+CMAKE_ARGS+=		-DSHARED_LIBS=ON
+
+include ../../wip/libnabo/depend.mk
+include ../../math/eigen3/depend.mk
+include ../../devel/yaml-cpp/depend.mk
+include ../../pkgtools/pkg-config/depend.mk
+include ../../mk/sysdep/cmake.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/robotpkg.mk
+include ../../mk/sysdep/doxygen.mk
+include ../../mk/sysdep/googletest.mk
diff --git a/libpointmatcher/PLIST b/libpointmatcher/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..d26202c0d93c1db78d912be3607dc14dfcbc5695
--- /dev/null
+++ b/libpointmatcher/PLIST
@@ -0,0 +1,166 @@
+@comment Thu Mar 27 11:23:01 CET 2014
+bin/pmicp
+include/pointmatcher/IO.h
+include/pointmatcher/Parametrizable.h
+include/pointmatcher/PointMatcher.h
+include/pointmatcher/PointMatcherPrivate.h
+include/pointmatcher/Registrar.h
+include/pointmatcher/Timer.h
+lib/libpointmatcher.so
+lib/libpointmatcher.so.1
+lib/libpointmatcher.so.${PKGVERSION}
+share/doc/libpointmatcher/README.md
+share/doc/libpointmatcher/api/html/IO_8h_source.html
+share/doc/libpointmatcher/api/html/Parametrizable_8h_source.html
+share/doc/libpointmatcher/api/html/PointMatcher_8h.html
+share/doc/libpointmatcher/api/html/PointMatcher_8h_source.html
+share/doc/libpointmatcher/api/html/Registrar_8h_source.html
+share/doc/libpointmatcher/api/html/annotated.html
+share/doc/libpointmatcher/api/html/bc_s.png
+share/doc/libpointmatcher/api/html/classes.html
+share/doc/libpointmatcher/api/html/closed.png
+share/doc/libpointmatcher/api/html/doxygen.css
+share/doc/libpointmatcher/api/html/doxygen.png
+share/doc/libpointmatcher/api/html/files.html
+share/doc/libpointmatcher/api/html/form_0.png
+share/doc/libpointmatcher/api/html/form_1.png
+share/doc/libpointmatcher/api/html/form_2.png
+share/doc/libpointmatcher/api/html/formula.repository
+share/doc/libpointmatcher/api/html/functions.html
+share/doc/libpointmatcher/api/html/functions_0x62.html
+share/doc/libpointmatcher/api/html/functions_0x63.html
+share/doc/libpointmatcher/api/html/functions_0x64.html
+share/doc/libpointmatcher/api/html/functions_0x65.html
+share/doc/libpointmatcher/api/html/functions_0x66.html
+share/doc/libpointmatcher/api/html/functions_0x67.html
+share/doc/libpointmatcher/api/html/functions_0x68.html
+share/doc/libpointmatcher/api/html/functions_0x69.html
+share/doc/libpointmatcher/api/html/functions_0x6c.html
+share/doc/libpointmatcher/api/html/functions_0x6d.html
+share/doc/libpointmatcher/api/html/functions_0x6e.html
+share/doc/libpointmatcher/api/html/functions_0x6f.html
+share/doc/libpointmatcher/api/html/functions_0x70.html
+share/doc/libpointmatcher/api/html/functions_0x71.html
+share/doc/libpointmatcher/api/html/functions_0x72.html
+share/doc/libpointmatcher/api/html/functions_0x73.html
+share/doc/libpointmatcher/api/html/functions_0x74.html
+share/doc/libpointmatcher/api/html/functions_0x76.html
+share/doc/libpointmatcher/api/html/functions_0x77.html
+share/doc/libpointmatcher/api/html/functions_0x7e.html
+share/doc/libpointmatcher/api/html/functions_func.html
+share/doc/libpointmatcher/api/html/functions_rela.html
+share/doc/libpointmatcher/api/html/functions_type.html
+share/doc/libpointmatcher/api/html/functions_vars.html
+share/doc/libpointmatcher/api/html/globals.html
+share/doc/libpointmatcher/api/html/globals_defs.html
+share/doc/libpointmatcher/api/html/hierarchy.html
+share/doc/libpointmatcher/api/html/index.html
+share/doc/libpointmatcher/api/html/namespacePointMatcherSupport.html
+share/doc/libpointmatcher/api/html/namespacemembers.html
+share/doc/libpointmatcher/api/html/namespacemembers_func.html
+share/doc/libpointmatcher/api/html/namespacemembers_type.html
+share/doc/libpointmatcher/api/html/namespacemembers_vars.html
+share/doc/libpointmatcher/api/html/namespaces.html
+share/doc/libpointmatcher/api/html/nav_f.png
+share/doc/libpointmatcher/api/html/nav_h.png
+share/doc/libpointmatcher/api/html/open.png
+share/doc/libpointmatcher/api/html/pages.html
+share/doc/libpointmatcher/api/html/structPointMatcher-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher.html
+share/doc/libpointmatcher/api/html/structPointMatcherIO-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherIO.html
+share/doc/libpointmatcher/api/html/structPointMatcherIO_1_1FileInfo-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherIO_1_1FileInfo.html
+share/doc/libpointmatcher/api/html/structPointMatcherIO_1_1FileInfoVector-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherIO_1_1FileInfoVector.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1InvalidElement-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1InvalidElement.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1InvalidModuleType-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1InvalidModuleType.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Logger-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Logger.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Logger.png
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Parametrizable-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Parametrizable.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Parametrizable.png
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Parametrizable_1_1InvalidParameter-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Parametrizable_1_1InvalidParameter.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Parametrizable_1_1ParameterDoc-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Parametrizable_1_1ParameterDoc.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1ClassDescriptor-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1ClassDescriptor.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1ClassDescriptor.png
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1GenericClassDescriptor-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1GenericClassDescriptor.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1GenericClassDescriptor.png
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1GenericClassDescriptorNoParam-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1GenericClassDescriptorNoParam.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1Registrar_1_1GenericClassDescriptorNoParam.png
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1SharedPtrVector-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1SharedPtrVector.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1TransformationError-members.html
+share/doc/libpointmatcher/api/html/structPointMatcherSupport_1_1TransformationError.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ConvergenceError-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ConvergenceError.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPointsFilter-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPointsFilter.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPointsFilter.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPointsFilters-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPointsFilters.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPointsFilters.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints_1_1InvalidField-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints_1_1InvalidField.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints_1_1Label-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints_1_1Label.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints_1_1Labels-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1DataPoints_1_1Labels.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ErrorMinimizer-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ErrorMinimizer.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ErrorMinimizer.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ErrorMinimizer_1_1ErrorElements-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ErrorMinimizer_1_1ErrorElements.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICP-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICP.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICP.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICPChainBase-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICPChainBase.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICPChainBase.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICPSequence-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICPSequence.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1ICPSequence.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Inspector-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Inspector.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Inspector.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Matcher-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Matcher.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Matcher.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Matches-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Matches.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1OutlierFilter-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1OutlierFilter.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1OutlierFilter.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1OutlierFilters-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1OutlierFilters.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1OutlierFilters.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Transformation-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Transformation.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Transformation.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1TransformationChecker-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1TransformationChecker.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1TransformationChecker.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1TransformationCheckers-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1TransformationCheckers.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1TransformationCheckers.png
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Transformations-members.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Transformations.html
+share/doc/libpointmatcher/api/html/structPointMatcher_1_1Transformations.png
+share/doc/libpointmatcher/api/html/tab_a.png
+share/doc/libpointmatcher/api/html/tab_b.png
+share/doc/libpointmatcher/api/html/tab_h.png
+share/doc/libpointmatcher/api/html/tab_s.png
+share/doc/libpointmatcher/api/html/tabs.css
+share/doc/libpointmatcher/api/html/todo.html
diff --git a/libpointmatcher/depend.mk b/libpointmatcher/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..4d7031b8ff607a414be234dfc157dd0f386e5534
--- /dev/null
+++ b/libpointmatcher/depend.mk
@@ -0,0 +1,25 @@
+# robotpkg depend.mk for:	mapping/libpointmatcher
+# Created:			Pierrick Koch on Thu, 27 Mar 2014
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+LIBPOINTMATCHER_DEPEND_MK:=${LIBPOINTMATCHER_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		libpointmatcher
+endif
+
+ifeq (+,$(LIBPOINTMATCHER_DEPEND_MK))
+PREFER.libpointmatcher?=	robotpkg
+
+DEPEND_USE+=		libpointmatcher
+
+DEPEND_ABI.libpointmatcher?=	libpointmatcher>=1.1.0
+DEPEND_DIR.libpointmatcher?=	../../wip/libpointmatcher
+
+SYSTEM_SEARCH.libpointmatcher= \
+	include/pointmatcher/PointMatcher.h \
+	lib/libpointmatcher.a
+endif
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/libpointmatcher/distinfo b/libpointmatcher/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..e89fadb8956bc27ec33623484a3161e6d4ae7141
--- /dev/null
+++ b/libpointmatcher/distinfo
@@ -0,0 +1,3 @@
+SHA1 (libpointmatcher-1.1.0.tar.gz) = 49ae5a799f90bd8f381d0a0a444465ad35c1e64b
+RMD160 (libpointmatcher-1.1.0.tar.gz) = dd9dfb488f44ca7d5231ce7f80b5b408f6e42269
+Size (libpointmatcher-1.1.0.tar.gz) = 1849742 bytes