diff --git a/Makefile b/Makefile
index 5522970f9f5ecdff78ac3d7c08b6167663fa5e26..9f18c401667ee6c755e02297c0a469027bc49698 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,7 @@ SUBDIR+=	tiago-robot
 SUBDIR+=	tiago-simulation
 SUBDIR+=	tiago-metapkg-ros-control-sot
 SUBDIR+=	tiago-tutorials
+SUBDIR+=	timeoptimization
 SUBDIR+=	tsid
 SUBDIR+=	ur5-description
 SUBDIR+=	urg
diff --git a/timeoptimization/DESCR b/timeoptimization/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..e935d5c1d8c13fd56fe7ebf27a88361418dbe182
--- /dev/null
+++ b/timeoptimization/DESCR
@@ -0,0 +1 @@
+On Time Optimization of Centroidal Momentum Dynamics
diff --git a/timeoptimization/Makefile b/timeoptimization/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..b21067bd8e3656ae91b963340537f266ce407649
--- /dev/null
+++ b/timeoptimization/Makefile
@@ -0,0 +1,22 @@
+# robotpkg Makefile for:	wip/timeoptimization
+# Created:			Guilhem Saurel on Wed, 23 Oct 2019
+#
+
+ORG=			loco-3d
+NAME=			timeoptimization
+VERSION=		1.1.0
+
+DISTNAME=		${NAME}-${VERSION}
+LICENSE=		gnu-lgpl-v3
+CATEGORIES=		wip
+
+HOMEPAGE=		${MASTER_SITE_GITHUB:=${ORG}/${NAME}}
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git
+MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
+
+include ../../math/eigen3/depend.mk
+include ../../devel/yaml-cpp/depend.mk
+include ../../devel/ros-catkin/depend.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++11.mk
+include ../../mk/robotpkg.mk
diff --git a/timeoptimization/PLIST b/timeoptimization/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..24ed1fded14b96aa45a104a3aabc7015f20165a8
--- /dev/null
+++ b/timeoptimization/PLIST
@@ -0,0 +1,34 @@
+@comment Wed Oct 23 21:19:50 CEST 2019
+include/momentumopt/cntopt/ContactPlanFromFile.hpp
+include/momentumopt/cntopt/ContactPlanInterface.hpp
+include/momentumopt/cntopt/ContactState.hpp
+include/momentumopt/dynopt/DynamicsOptimizer.hpp
+include/momentumopt/dynopt/DynamicsState.hpp
+include/momentumopt/settting/Definitions.hpp
+include/momentumopt/settting/PlannerParams.hpp
+include/momentumopt/settting/PlannerSetting.hpp
+include/momentumopt/utilities/Clock.hpp
+include/momentumopt/yaml_eigen.h
+include/timeoptimization/solver/interface/Cone.hpp
+include/timeoptimization/solver/interface/Exprs.hpp
+include/timeoptimization/solver/interface/Model.hpp
+include/timeoptimization/solver/interface/OptVar.hpp
+include/timeoptimization/solver/interface/Solver.hpp
+include/timeoptimization/solver/interface/SolverParams.hpp
+include/timeoptimization/solver/interface/SolverSetting.hpp
+include/timeoptimization/solver/interface/Var.hpp
+include/timeoptimization/solver/optimizer/EqRoutine.hpp
+include/timeoptimization/solver/optimizer/IPSolver.hpp
+include/timeoptimization/solver/optimizer/InfoPrinter.hpp
+include/timeoptimization/solver/optimizer/LinSolver.hpp
+include/timeoptimization/solver/optimizer/SparseCholesky.hpp
+lib/libmomentumopt.so
+lib/libtimeoptimization-solver.so
+lib/pkgconfig/momentumopt.pc
+lib/pkgconfig/timeoptimization-solver.pc
+share/momentumopt/cmake/momentumoptConfig-version.cmake
+share/momentumopt/cmake/momentumoptConfig.cmake
+share/momentumopt/package.xml
+share/timeoptimization-solver/cmake/timeoptimization-solverConfig-version.cmake
+share/timeoptimization-solver/cmake/timeoptimization-solverConfig.cmake
+share/timeoptimization-solver/package.xml
diff --git a/timeoptimization/depend.mk b/timeoptimization/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..4e95c2d4f9045124358031c59303f0916b40e255
--- /dev/null
+++ b/timeoptimization/depend.mk
@@ -0,0 +1,29 @@
+# robotpkg depend.mk for:	wip/timeoptimization
+# Created:			Guilhem Saurel on Wed, 23 Oct 2019
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+TIMEOPTIMIZATION_DEPEND_MK:=	${TIMEOPTIMIZATION_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=			timeoptimization
+endif
+
+ifeq (+,$(TIMEOPTIMIZATION_DEPEND_MK)) # --------------------------------------
+
+
+PREFER.timeoptimization?=		robotpkg
+
+DEPEND_USE+=			timeoptimization
+
+DEPEND_ABI.timeoptimization?=	timeoptimization>=1.1.0
+DEPEND_DIR.timeoptimization?=	../../wip/timeoptimization
+
+SYSTEM_SEARCH.timeoptimization=\
+	include/timeoptimization/solver/interface/Cone.hpp			\
+	'lib/pkgconfig/timeoptimization-solver.pc:/Version/s/[^0-9.]//gp'	\
+	lib/libtimeoptimization-solver.so
+
+endif # TIMEOPTIMIZATION_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/timeoptimization/distinfo b/timeoptimization/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..83a7e04c10e98e798722401fccd1af0c059b4200
--- /dev/null
+++ b/timeoptimization/distinfo
@@ -0,0 +1,3 @@
+SHA1 (timeoptimization-1.1.0.tar.gz) = baaf97acdffe2574ef3bcee4906c7874066337bb
+RMD160 (timeoptimization-1.1.0.tar.gz) = 24ab2cd36661fa6e9e778fb61404bf522202cd14
+Size (timeoptimization-1.1.0.tar.gz) = 264650 bytes