diff --git a/Makefile b/Makefile
index eeafba5e5ac681f36648570a8596ff1bc2c57780..28cb46c243dfc57fde7e111f0ec3660b9aacacf9 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ SUBDIR+=	ros-swri-roscpp
 SUBDIR+=	ros-swri-serial-util
 SUBDIR+=	ros-swri-string-util
 SUBDIR+=	ros-universal-robot
+SUBDIR+=	ros-urdf-geometry-parser
 SUBDIR+=	ros-warehouse-ros
 SUBDIR+=	rqt-dynamic-graph
 SUBDIR+=	rviz-plugin-covariance
diff --git a/prf-ros-controllers/Makefile b/prf-ros-controllers/Makefile
index f8002da59f6527a4942dc10e411d7af727f90ad7..85e0be890e3f04deff2db578e4b8822cf69c232a 100644
--- a/prf-ros-controllers/Makefile
+++ b/prf-ros-controllers/Makefile
@@ -49,7 +49,7 @@ include ../../middleware/ros-comm/depend.mk
 include ../../motion/ros-control-toolbox/depend.mk
 include ../../wip/pal-hardware-interfaces/depend.mk
 include ../../wip/sysdep/ros-four-wheel-steering-msgs.mk
-include ../../wip/sysdep/ros-urdf-geometry-parser.mk
+include ../../wip/ros-urdf-geometry-parser/depend.mk
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk
 include ../../mk/robotpkg.mk
diff --git a/prf-teleop-tools/Makefile b/prf-teleop-tools/Makefile
index 6f7bdef03d18f151f110faae83d9557dad6a2f71..3dac3065a98b5b87f7c3643f7d5ea69cb559b008 100644
--- a/prf-teleop-tools/Makefile
+++ b/prf-teleop-tools/Makefile
@@ -49,7 +49,7 @@ include ../../middleware/ros-comm/depend.mk
 include ../../motion/ros-control-toolbox/depend.mk
 include ../../wip/pal-hardware-interfaces/depend.mk
 include ../../wip/sysdep/ros-four-wheel-steering-msgs.mk
-include ../../wip/sysdep/ros-urdf-geometry-parser.mk
+include ../../wip/ros-urdf-geometry-parser/depend.mk
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk
 include ../../mk/robotpkg.mk
diff --git a/ros-urdf-geometry-parser/DESCR b/ros-urdf-geometry-parser/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..c49b2b29fd04538354fe8fee64780152a0702daa
--- /dev/null
+++ b/ros-urdf-geometry-parser/DESCR
@@ -0,0 +1 @@
+Extract geometry value of a vehicle from urdf
diff --git a/ros-urdf-geometry-parser/Makefile b/ros-urdf-geometry-parser/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..38e7041d4b5d3bf7ea69e15b5287144c9535ed34
--- /dev/null
+++ b/ros-urdf-geometry-parser/Makefile
@@ -0,0 +1,23 @@
+# robotpkg Makefile for:	wip/ros-urdf-geometry-parser
+# Created:			Guilhem Saurel on Mon, 27 Jan 2020
+#
+
+ROS_PKG=		urdf_geometry_parser
+ROS_VERSION=		0.0.3
+ROS_REPO=		ros-controls
+
+HOMEPAGE=		${MASTER_SITE_GITHUB:=${ROS_REPO}/${ROS_PKG}}
+MASTER_SITES=		${HOMEPAGE}/archive/
+MASTER_REPOSITORY=	git ${HOMEPAGE}.git
+
+CATEGORIES=		wip
+ROS_COMMENT=		Extract geometry value of a vehicle from urdf
+
+include ../../meta-pkgs/ros-base/Makefile.common
+
+include ../../graphics/ros-urdf/depend.mk
+include ../../math/ros-geometry2/depend.mk
+
+include ../../devel/ros-catkin/depend.mk
+include ../../mk/sysdep/python.mk
+include ../../mk/robotpkg.mk
diff --git a/ros-urdf-geometry-parser/PLIST b/ros-urdf-geometry-parser/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..32788ad85343b6a80bbc7dfa953fbc762a039346
--- /dev/null
+++ b/ros-urdf-geometry-parser/PLIST
@@ -0,0 +1,7 @@
+@comment Mon Jan 27 14:03:00 CET 2020
+include/urdf_geometry_parser/urdf_geometry_parser.h
+lib/liburdf_geometry_parser.so
+lib/pkgconfig/urdf_geometry_parser.pc
+share/urdf_geometry_parser/cmake/urdf_geometry_parserConfig-version.cmake
+share/urdf_geometry_parser/cmake/urdf_geometry_parserConfig.cmake
+share/urdf_geometry_parser/package.xml
diff --git a/ros-urdf-geometry-parser/depend.mk b/ros-urdf-geometry-parser/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..5df974a1367e16187fa5c2b16c5fc8ee95ab01d8
--- /dev/null
+++ b/ros-urdf-geometry-parser/depend.mk
@@ -0,0 +1,35 @@
+# robotpkg depend.mk for:	wip/ros-urdf-geometry-parser
+# Created:			Guilhem Saurel on Mon, 27 Jan 2020
+#
+
+DEPEND_DEPTH:=			${DEPEND_DEPTH}+
+ROS_URDF_GEOMETRY_PARSER_DEPEND_MK:=	${ROS_URDF_GEOMETRY_PARSER_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=					ros-urdf-geometry-parser
+endif
+
+ifeq (+,$(ROS_URDF_GEOMETRY_PARSER_DEPEND_MK)) # --------------------------------------
+
+include ../../meta-pkgs/ros-base/depend.common
+include ../../mk/robotpkg.prefs.mk
+
+PREFER.ros-urdf-geometry-parser?=		${PREFER.ros-base}
+SYSTEM_PREFIX.ros-urdf-geometry-parser?=	${SYSTEM_PREFIX.ros-base}
+
+DEPEND_USE+=					ros-urdf-geometry-parser
+ROS_DEPEND_USE+=				ros-urdf-geometry-parser
+
+DEPEND_ABI.ros-urdf-geometry-parser?=		ros-urdf-geometry-parser>=0.0.3
+DEPEND_DIR.ros-urdf-geometry-parser?=		../../wip/ros-urdf-geometry-parser
+
+SYSTEM_SEARCH.ros-urdf-geometry-parser=\
+	include/urdf_geometry_parser/urdf_geometry_parser.h								\
+	lib/liburdf_geometry_parser.so											\
+	'lib/pkgconfig/urdf_geometry_parser.pc:/Version/s/[^0-9.]//gp'							\
+	'share/urdf_geometry_parser/cmake/urdf_geometry_parserConfig-version.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp'	\
+	'share/urdf_geometry_parser/package.xml:/<version>/s/[^.0-9]//gp'
+
+endif # ROS_URDF_GEOMETRY_PARSER_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/ros-urdf-geometry-parser/distinfo b/ros-urdf-geometry-parser/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..039c70e2953db0780f67f47e1f0aea2af4f651da
--- /dev/null
+++ b/ros-urdf-geometry-parser/distinfo
@@ -0,0 +1,3 @@
+SHA1 (ros/urdf_geometry_parser/0.0.3.tar.gz) = d5705dbb2d6e3d96bb809563b7cf2894c95ded6f
+RMD160 (ros/urdf_geometry_parser/0.0.3.tar.gz) = 49d73692ede188e149cddd7a40752db837b2bdb7
+Size (ros/urdf_geometry_parser/0.0.3.tar.gz) = 4412 bytes
diff --git a/sysdep/ros-urdf-geometry-parser.mk b/sysdep/ros-urdf-geometry-parser.mk
deleted file mode 100644
index d03d96f9f6f7bb340aab3ac40834354290dd3922..0000000000000000000000000000000000000000
--- a/sysdep/ros-urdf-geometry-parser.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# robotpkg sysdep/ros-urdf-geometry-parser
-# Created:			Olivier Stasse on Mon 11 2018
-#
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-URDF_GEOMETRY_PARSER_MK:=	${URDF_GEOMETRY_PARSER_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		ros-urdf-geometry-parser
-endif
-
-ifeq (+,$(URDF_GEOMETRY_PARSER_MK)) # ---------------------------------------------
-
-include ../../meta-pkgs/ros-base/depend.common
-
-PREFER.ros-urdf-geometry-parser?=		system
-SYSTEM_PREFIX.ros-urdf-geometry-parser?=    ${SYSTEM_PREFIX.ros-base}
-
-DEPEND_USE+=		ros-urdf-geometry-parser
-ROS_DEPEND_USE+=		ros-urdf-geometry-parser
-
-DEPEND_ABI.ros-urdf-geometry-parser?=	ros-urdf-geometry-parser>=0.0.1
-
-DEPEND_METHOD.ros-urdf-geometry-parser+=build
-
-SYSTEM_SEARCH.ros-urdf-geometry-parser+=	'share/urdf_geometry_parser/package.xml:/<version>/s/[^.0-9]//gp'
-
-
-endif # URDF_GEOMETRY_PARSER_MK ---------------------------------------------------
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}