diff --git a/hpp-universal-robot/Makefile b/hpp-universal-robot/Makefile
index 581fc42f6d4a6fc11a15a93feafcdc894a2eb14e..f4a36b8a00f9260fa1a97736a7dc57af87dd382d 100644
--- a/hpp-universal-robot/Makefile
+++ b/hpp-universal-robot/Makefile
@@ -6,16 +6,11 @@ HPP_PACKAGE=	hpp-universal-robot
 HPP_COMMENT=	Data specific to robots ur5 and ur10 for hpp-corbaserver
 HPP_VERSION=	4.2.1
 
-# Workaround include of both Makefile.common
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR=
-
 CATEGORIES=	wip
 
 DYNAMIC_PLIST_DIRS+=	share/doc/${ROSNAME}
 
 include ../../meta-pkgs/hpp/Makefile.common
-include ../../meta-pkgs/ros-base/Makefile.common
 
 include ../../wip/ros-universal-robot/depend.mk
 include ../../devel/ros-xacro/depend.mk
@@ -24,3 +19,6 @@ include ../../mk/sysdep/python.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++.mk
 include ../../mk/robotpkg.mk
+
+export PYTHONPATH=	$(word 1,${SYSTEM_PREFIX.ros-base})/lib/python${PYTHON_VERSION}/dist-packages
+export ROS_PACKAGE_PATH=	$(word 1,${SYSTEM_PREFIX.ros-base})