diff --git a/Makefile b/Makefile
index d0c6bf50a7a066b583f3840a3c81870f5966f378..cc0ddba6e0a948be48a2967d5363012406aa1a19 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ SUBDIR+=	catkin
 SUBDIR+=	flann
 SUBDIR+=	genom3
 SUBDIR+=	genom3-pocolibs
+SUBDIR+=	genom3-ros
 SUBDIR+=	gest-genom
 SUBDIR+=	hpp-geometry
 SUBDIR+=	hyper
diff --git a/genom3-ros/DESCR b/genom3-ros/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..a62d905ad894e1df042a5eb51780e2ea23806cd5
--- /dev/null
+++ b/genom3-ros/DESCR
@@ -0,0 +1,2 @@
+The genom3-ros template (see meta-pkgs/ros-base) provides a GenoM3
+template for generating ros-based components.
diff --git a/genom3-ros/Makefile b/genom3-ros/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..edad9ecaa1b36af709f40b36eb0241b6365675fc
--- /dev/null
+++ b/genom3-ros/Makefile
@@ -0,0 +1,29 @@
+# robotpkg Makefile for:	architecture/genom3-ros
+# Created:			Anthony Mallet on Fri, 19 Oct 2012
+#
+
+DISTNAME=	genom3-ros-1.0
+CATEGORIES=	architecture
+MASTER_SITES=	${MASTER_SITE_OPENROBOTS:=genom3-ros/}
+MASTER_REPOSITORY= git git://git.openrobots.org/git/robots/genom3-ros
+
+MAINTAINER=	mallet@laas.fr
+HOMEPAGE=	https://homepages.laas.fr/mallet/soft/architecture/genom3
+COMMENT=	GenoM3 template for ros-based components
+
+LICENSE=	2-clause-bsd
+
+GNU_CONFIGURE=	yes
+NOT_FOR_PLATFORM=	# empty
+USE_LANGUAGES+=	c c++
+
+include ../../devel/boost-headers/depend.mk
+include ../../pkgtools/pkg-config/depend.mk
+include ../../wip/genom3/depend.mk
+include ../../wip/ros-actionlib/depend.mk
+include ../../wip/ros-comm/depend.mk
+include ../../wip/ros-common-msgs/depend.mk
+include ../../wip/ros-core/depend.mk
+include ../../wip/ros-gencpp/depend.mk
+include ../../wip/ros-genpy/depend.mk
+include ../../mk/robotpkg.mk
diff --git a/genom3-ros/PLIST b/genom3-ros/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..68a5d098687b412f5da7c59a4d3ae092a731c5a8
--- /dev/null
+++ b/genom3-ros/PLIST
@@ -0,0 +1,50 @@
+@comment Fri Oct 19 16:43:02 CEST 2012
+lib/libros-client.la
+lib/pkgconfig/genom3-ros.pc
+share/genom/site-templates/ros/client/c/c-client-uninstalled.pc.in
+share/genom/site-templates/ros/client/c/c-client.pc.in
+share/genom/site-templates/ros/client/c/client.Makefile.am
+share/genom/site-templates/ros/client/c/client.cc
+share/genom/site-templates/ros/client/c/client.configure.ac
+share/genom/site-templates/ros/client/c/client.h
+share/genom/site-templates/ros/client/c/docutil.tcl
+share/genom/site-templates/ros/client/c/info.c
+share/genom/site-templates/ros/client/c/init.cc
+share/genom/site-templates/ros/client/c/json.c
+share/genom/site-templates/ros/client/c/msglib.cc
+share/genom/site-templates/ros/client/c/msglib.h
+share/genom/site-templates/ros/client/c/plugin.c
+share/genom/site-templates/ros/client/c/portlib.cc
+share/genom/site-templates/ros/client/c/private.h
+share/genom/site-templates/ros/client/c/template.tcl
+share/genom/site-templates/ros/client/ros/client.Makefile.am
+share/genom/site-templates/ros/client/ros/client.configure.ac
+share/genom/site-templates/ros/client/ros/template.tcl
+share/genom/site-templates/ros/common/action.h
+share/genom/site-templates/ros/common/autoconf/ax_boost_base.m4
+share/genom/site-templates/ros/common/autoconf/ax_boost_thread.m4
+share/genom/site-templates/ros/common/autoconf/ax_pthread.m4
+share/genom/site-templates/ros/common/genom-serialize.h
+share/genom/site-templates/ros/common/genrosmsg.tcl
+share/genom/site-templates/ros/common/portlib.h
+share/genom/site-templates/ros/common/ros.manifest.xml
+share/genom/site-templates/ros/common/serialize.h
+share/genom/site-templates/ros/common/service.h
+share/genom/site-templates/ros/common/typecopy.h
+share/genom/site-templates/ros/common/typeutil.tcl
+share/genom/site-templates/ros/server/activities.cc
+share/genom/site-templates/ros/server/activities.h
+share/genom/site-templates/ros/server/codels.mappings.h
+share/genom/site-templates/ros/server/control-codels.cc
+share/genom/site-templates/ros/server/control-task.cc
+share/genom/site-templates/ros/server/exec-task.cc
+share/genom/site-templates/ros/server/exec-task.h
+share/genom/site-templates/ros/server/internals.h
+share/genom/site-templates/ros/server/main.cc
+share/genom/site-templates/ros/server/port.cc
+share/genom/site-templates/ros/server/port.h
+share/genom/site-templates/ros/server/remote.cc
+share/genom/site-templates/ros/server/remote.h
+share/genom/site-templates/ros/server/ros.Makefile.am
+share/genom/site-templates/ros/server/ros.configure.ac
+share/genom/site-templates/ros/server/template.tcl
diff --git a/genom3-ros/depend.mk b/genom3-ros/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..466bceb75937c3b2f09d65172abde9b768959391
--- /dev/null
+++ b/genom3-ros/depend.mk
@@ -0,0 +1,26 @@
+# robotpkg depend.mk for:	architecture/genom3-ros
+# Created:			Anthony Mallet on Fri, 19 Oct 2012
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+GENOM3_ROS_DEPEND_MK:=	${GENOM3_ROS_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		genom3-ros
+endif
+
+ifeq (+,$(GENOM3_ROS_DEPEND_MK)) # -----------------------------------------
+
+DEPEND_USE+=		genom3-ros
+PREFER.genom3-ros?=robotpkg
+
+SYSTEM_SEARCH.genom3-ros=\
+	lib/libros-client.so				\
+	'lib/pkgconfig/genom3-ros.pc:/Version/s/[^0-9.]//gp'
+
+DEPEND_ABI.genom3-ros?=	genom3-ros>=1.0
+DEPEND_DIR.genom3-ros?=	../../wip/genom3-ros
+
+endif # GENOM3_ROS_DEPEND_MK -----------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/genom3-ros/distinfo b/genom3-ros/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..bb3e61891c022a42cfcbd07ad68b3be4e960375c
--- /dev/null
+++ b/genom3-ros/distinfo
@@ -0,0 +1,3 @@
+SHA1 (genom3-ros-1.0.tar.gz) = 7b73f915d4fe1ba02e7b5111ec8cb04d423cd3f7
+RMD160 (genom3-ros-1.0.tar.gz) = a2b2c2f1b60931d41b7d321aa19068cd9e28f248
+Size (genom3-ros-1.0.tar.gz) = 370508 bytes