diff --git a/Makefile b/Makefile
index 49ac9bf8f34c95c1b77d3dd875d09b007c5f2fb0..c85c0b4c4b7349c5d68dbf0547c58f1849996095 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ SUBDIR+=	hpp-localstepper
 SUBDIR+=	hpp-model
 SUBDIR+=	hpp-model
 SUBDIR+=	hpp-openhrp
+SUBDIR+=	hpp-template-corba
 SUBDIR+=	hpp-walkplanner
 SUBDIR+=	hrp2-14
 SUBDIR+=	hrp2-builder
diff --git a/hpp-template-corba/DESCR b/hpp-template-corba/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..07566c1e9b81345e41ba534fe05d1480863c9b61
--- /dev/null
+++ b/hpp-template-corba/DESCR
@@ -0,0 +1,8 @@
+This package is intended to ease construction of CORBA servers by
+templating actions that are common to all servers.
+
+This package only contains one template class hpp::corba::Server. The
+parameter of this template class is the implementation of an idl
+interface.
+
+For more information, install the package and see the html documentation.
diff --git a/hpp-template-corba/Makefile b/hpp-template-corba/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..f8d09308c8ab8be5ab23cd2fb8226e492241da92
--- /dev/null
+++ b/hpp-template-corba/Makefile
@@ -0,0 +1,50 @@
+# $LAAS: Makefile 2009/04/09 19:08:22 mallet $
+#
+# Copyright (c) 2007-2009 LAAS/CNRS
+# All rights reserved.
+#
+# Redistribution  and  use in source   and binary forms,  with or without
+# modification, are permitted provided that  the following conditions are
+# met:
+#
+#   1. Redistributions  of  source code must  retain  the above copyright
+#      notice and this list of conditions.
+#   2. Redistributions in binary form must  reproduce the above copyright
+#      notice  and this list of  conditions in the documentation   and/or
+#      other materials provided with the distribution.
+#
+#                                       Anthony Mallet on Mon Aug 27 2007
+#
+
+HPP_PACKAGE=	hpp-template-corba
+VERSION=	0.4
+
+CATEGORIES=	devel
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_JRL}corba/hpp-template-corba
+
+COMMENT=	Template CORBA server
+
+USE_LANGUAGES+=	c c++
+GNU_CONFIGURE=	yes
+
+# --- options --------------------------------------------------------
+
+# hpp-util support
+PKG_SUPPORTED_OPTIONS+=	hpp-util
+PKG_SUGGESTED_OPTIONS+=	hpp-util
+
+PKG_OPTION_DESCR.hpp-util=	Trigger a dependency to hpp-util
+define PKG_OPTION_SET.hpp-util
+  CONFIGURE_ARGS+=	--enable-hpp-util
+  include ../../wip/hpp/Makefile.common
+  include ../../wip/hpp-util/depend.mk
+endef
+
+# --------------------------------------------------------------------
+
+include ../../wip/hpp/Makefile.common
+include ../../devel/omniORB/depend.mk
+include ../../pkgtools/libtool/depend.mk
+include ../../pkgtools/pkg-config/depend.mk
+include ../../mk/sysdep/doxygen.mk
+include ../../mk/robotpkg.mk
diff --git a/hpp-template-corba/PLIST b/hpp-template-corba/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..7a89ad3c050d78f8872e57a78d39d5ab9d586575
--- /dev/null
+++ b/hpp-template-corba/PLIST
@@ -0,0 +1,6 @@
+@comment Sun Jun 13 11:21:56 CEST 2010
+include/hpp/corba/template/debug.hh
+include/hpp/corba/template/doc.hh
+include/hpp/corba/template/server.hh
+include/hpp/corba/template/server.hxx
+lib/pkgconfig/hpp-template-corba.pc
diff --git a/hpp-template-corba/depend.mk b/hpp-template-corba/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..eb0108971d93e862909ee3c31241f744f8c206ff
--- /dev/null
+++ b/hpp-template-corba/depend.mk
@@ -0,0 +1,43 @@
+# $LAAS: depend.mk 2009/04/09 18:23:13 mallet $
+#
+# Copyright (c) 2010 CNRS
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without   fee is hereby granted, provided   that the above  copyright
+# notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS  SOFTWARE INCLUDING ALL  IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL THE AUTHOR  BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR  ANY DAMAGES WHATSOEVER RESULTING  FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+# OTHER TORTIOUS ACTION,   ARISING OUT OF OR IN    CONNECTION WITH THE USE   OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+#                                      Florent Lamiraux on June 13, 2010
+#
+
+DEPEND_DEPTH:=			${DEPEND_DEPTH}+
+HPP_TEMPLATE_CORBA_DEPEND_MK:=	${HPP_TEMPLATE_CORBA_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=			hpp-template-corba
+endif
+
+ifeq (+,$(HPP_TEMPLATE_CORBA_DEPEND_MK)) # ------------------------------------
+
+PREFER.hpp-template-corba?=	robotpkg
+
+DEPEND_USE+=			hpp-template-corba
+
+DEPEND_ABI.hpp-template-corba?=	hpp-template-corba>=0.4
+DEPEND_DIR.hpp-template-corba?=	../../devel/hpp-template-corba
+
+SYSTEM_SEARCH.hpp-template-corba=\
+	include/hpp/corba/template/server.hh				\
+	'lib/pkgconfig/hpp-template-corba.pc:/Version/s/[^0-9.]//gp'
+
+endif # --------------------------------------------------------------------
+
+DEPEND_DEPTH:=			${DEPEND_DEPTH:+=}
diff --git a/hpp-template-corba/distinfo b/hpp-template-corba/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..e64179286582d899ac5e9cba9a72143d695e490a
--- /dev/null
+++ b/hpp-template-corba/distinfo
@@ -0,0 +1,3 @@
+SHA1 (hpp-template-corba-0.4.tar.gz) = 61c678ac1032f368e8963ee5ac9ed22cff6f72db
+RMD160 (hpp-template-corba-0.4.tar.gz) = 8252e3d69870ee8798b5dc6410d2790db19787f6
+Size (hpp-template-corba-0.4.tar.gz) = 396025 bytes