diff --git a/talos-gazebo-ros-control/Makefile b/talos-gazebo-ros-control/Makefile
index a40a1776ce75d03235c895f9083e3ac612349da0..3d5955581b6821d1359083401f28c58a2786fb17 100644
--- a/talos-gazebo-ros-control/Makefile
+++ b/talos-gazebo-ros-control/Makefile
@@ -2,13 +2,9 @@
 # Created:			Olivier Stasse on Mer, 3 May 2017
 #
 VERSION=	2.6.5
-PKGBASE=	talos-gazebo-ros-control
-PKGNAME=	${PKGBASE}-${VERSION}
+PKGNAME=	talos-gazebo-ros-control-${VERSION}
 DISTNAME=	$(subst -,_,${PKGBASE})-${VERSION}
 
-ROS_GITTAG=	${DISTNAME}
-WRKSRC=		${WRKDIR}/${ROS_GITTAG}
-
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_JRL:=talos/talos_gazebo_ros_control/}
 LICENSE=	openhrp-grx-license
@@ -17,7 +13,9 @@ RESTRICTED=     Redistribution of repackaged binaries not permitted
 NO_PUBLIC_SRC=  ${RESTRICTED}
 NO_PUBLIC_BIN=  ${RESTRICTED}
 
-CMAKE_PREFIX_PATH+= ${ROBOTPKG_BASE}
+CMAKE_ARGS+=\
+  -Dgazebo_INCLUDE_DIRS=$(filter include/%,${SYSTEM_SEARCH.gazebo})	\
+  -Dgazebo_LIBRARIES=$(filter %.so,${SYSTEM_SEARCH.gazebo})
 
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
@@ -35,7 +33,8 @@ include ../../math/ros-geometry/depend.mk
 include ../../middleware/ros-actionlib/depend.mk
 include ../../middleware/ros-comm/depend.mk
 include ../../motion/ros-control-toolbox/depend.mk
+include ../../mk/sysdep/gazebo.mk
+include ../../mk/sysdep/libogre.mk
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk
 include ../../mk/robotpkg.mk
-