diff --git a/hpp-universal-robot/DESCR b/hpp-universal-robot/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..033a12515bbde4cc8119388c53edbb8275dd01a4
--- /dev/null
+++ b/hpp-universal-robot/DESCR
@@ -0,0 +1 @@
+Data specific to robots ur5 and ur10 for hpp-corbaserver
diff --git a/hpp-universal-robot/Makefile b/hpp-universal-robot/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..f457579c6050614d56728480b6a980b908e72031
--- /dev/null
+++ b/hpp-universal-robot/Makefile
@@ -0,0 +1,23 @@
+# robotpkg Makefile for:	wip/hpp-universal-robot
+# Created:			Guilhem Saurel on Fri, 10 Oct 2018
+#
+
+HPP_PACKAGE=	hpp-universal-robot
+HPP_COMMENT=	Data specific to robots ur5 and ur10 for hpp-corbaserver
+HPP_VERSION=	4.2.1
+
+CATEGORIES=	wip
+
+DYNAMIC_PLIST_DIRS+=	share/doc/${ROSNAME}
+
+export ROS_PACKAGE_PATH+=	${PREFIX.hpp-universal-robot}/share
+
+include ../../meta-pkgs/hpp/Makefile.common
+
+include ../../wip/universal-robot/depend.mk
+include ../../devel/ros-xacro/depend.mk
+
+include ../../mk/sysdep/python.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/robotpkg.mk
diff --git a/hpp-universal-robot/PLIST b/hpp-universal-robot/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..c51c22d0802b63d61a7a155917708586088bebfe
--- /dev/null
+++ b/hpp-universal-robot/PLIST
@@ -0,0 +1,18 @@
+@comment Thu Dec 20 17:43:28 CET 2018
+include/hpp/universal/robot/config.hh
+include/hpp/universal/robot/deprecated.hh
+include/hpp/universal/robot/warning.hh
+lib/pkgconfig/hpp-universal-robot.pc
+${PYTHON_SITELIB}/hpp/corbaserver/manipulation/ur5/__init__.py
+${PYTHON_SITELIB}/hpp/corbaserver/manipulation/ur5/robot.py
+${PYTHON_SITELIB}/hpp/corbaserver/ur5/__init__.py
+${PYTHON_SITELIB}/hpp/corbaserver/ur5/robot.py
+share/ur_description/launch/ur5.launch
+share/ur_description/rviz/config.rviz
+share/ur_description/srdf/ur3_gripper.srdf
+share/ur_description/srdf/ur5.srdf
+share/ur_description/srdf/ur5_gripper.srdf
+share/ur_description/srdf/ur5_joint_limited_robot.srdf
+share/ur_description/urdf/ur3_gripper.urdf
+share/ur_description/urdf/ur5_gripper.urdf
+share/ur_description/urdf/ur5_joint_limited_robot.urdf
diff --git a/hpp-universal-robot/depend.mk b/hpp-universal-robot/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..ffeef54da98a715e3cb3e6deee63be7a3f63cb69
--- /dev/null
+++ b/hpp-universal-robot/depend.mk
@@ -0,0 +1,27 @@
+# robotpkg depend.mk for:	wip/hpp-universal-robot
+# Created:			Guilhem Saurel on Fri, 19 Oct 2018
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+HPP_UNIVERSAL_ROBOT_DEPEND_MK:=	${HPP_UNIVERSAL_ROBOT_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		hpp-universal-robot
+endif
+
+ifeq (+,$(HPP_UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
+
+PREFER.hpp-universal-robot?=	robotpkg
+
+DEPEND_USE+=		hpp-universal-robot
+
+DEPEND_ABI.hpp-universal-robot?=	hpp-universal-robot>=4.2.1
+DEPEND_DIR.hpp-universal-robot?=	../../wip/hpp-universal-robot
+
+SYSTEM_SEARCH.hpp-universal-robot=\
+	include/hpp/universal/robot/config.hh	\
+	'lib/pkgconfig/hpp-universal-robot.pc:/Version/s/[^0-9.]//gp'
+
+endif # HPP_UNIVERSAL_ROBOT_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/hpp-universal-robot/distinfo b/hpp-universal-robot/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..9ac1f7efa31cb8961e019f03f1acdfed90e8b6eb
--- /dev/null
+++ b/hpp-universal-robot/distinfo
@@ -0,0 +1,3 @@
+SHA1 (hpp-universal-robot-4.2.1.tar.gz) = 13d93365327fa5804812aaa59447245cece25715
+RMD160 (hpp-universal-robot-4.2.1.tar.gz) = 11bfe4a222ac6fdd8861dc003a40b571db14b9d8
+Size (hpp-universal-robot-4.2.1.tar.gz) = 769198 bytes
diff --git a/universal-robot/depend.mk b/universal-robot/depend.mk
index c2cc977ede92e21b17c7b1a02b7f49f85a6f0c91..873e2c7f736eef6765f9ad4a641cc0d04f1f1339 100644
--- a/universal-robot/depend.mk
+++ b/universal-robot/depend.mk
@@ -19,7 +19,7 @@ DEPEND_ABI.universal-robot?=	universal-robot>=1.2.1
 DEPEND_DIR.universal-robot?=	../../wip/universal-robot
 
 SYSTEM_SEARCH.universal-robot=\
-	include/ur_msgs/SetIO.hh	\
+	include/ur_msgs/SetIO.h	\
 	'lib/pkgconfig/ur_description.pc:/Version/s/[^0-9.]//gp'
 
 endif # UNIVERSAL_ROBOT_DEPEND_MK --------------------------------------------