diff --git a/talos-roboticsgroup-gazebo-plugins/Makefile b/talos-roboticsgroup-gazebo-plugins/Makefile
index 32c9958f6898f579ced0f70462dfbcf52e94239e..01119c166d8b7d90ba13edd254effcd0fff47217 100644
--- a/talos-roboticsgroup-gazebo-plugins/Makefile
+++ b/talos-roboticsgroup-gazebo-plugins/Makefile
@@ -2,13 +2,9 @@
 # Created:			Olivier Stasse on Fri, 21 Apr 2017
 #
 VERSION=	0.0.3
-PKGBASE=	talos-roboticsgroup-gazebo-plugins
-PKGNAME=	${PKGBASE}-${VERSION}
+PKGNAME=	talos-roboticsgroup-gazebo-plugins-${VERSION}
 DISTNAME=	$(subst -,_,${PKGBASE})-${VERSION}
 
-ROS_GITTAG=	${DISTNAME}
-WRKSRC=		${WRKDIR}/${ROS_GITTAG}
-
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_JRL:=talos/talos_roboticsgroup_gazebo_plugins/}
 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
@@ -32,9 +30,10 @@ include ../../lang/ros-message-runtime/depend.mk
 include ../../math/ros-geometry/depend.mk
 include ../../middleware/ros-actionlib/depend.mk
 include ../../middleware/ros-comm/depend.mk
-include ../../wip/talos-pal-hardware-interfaces/depend.mk
 include ../../motion/ros-control-toolbox/depend.mk
+include ../../simulation/gazebo-ros-pkgs/depend.mk
+include ../../wip/talos-pal-hardware-interfaces/depend.mk
+include ../../mk/sysdep/gazebo.mk
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk
 include ../../mk/robotpkg.mk
-