diff --git a/pal-gazebo-worlds/Makefile b/pal-gazebo-worlds/Makefile
index ca0a0a8fc640aedde754f41519f1536ab2af107f..926e16a0650d201e74034590e5aa5c30b04263bf 100644
--- a/pal-gazebo-worlds/Makefile
+++ b/pal-gazebo-worlds/Makefile
@@ -4,14 +4,15 @@
VERSION= 2.0.8
PKGBASE= pal-gazebo-worlds
+PKGNAME= ${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PKGBASE})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
-PKG_REVISION= 1
+PKG_REVISION= 2
CATEGORIES= wip
-HOMEPAGE= ${MASTER_SITE_GITHUB:=pal-robotics/${ROSNAME}}
+HOMEPAGE= ${MASTER_SITE_GITHUB:=pal-robotics/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Simulation worlds for PAL robots
LICENSE= pal-license
@@ -22,7 +23,7 @@ NO_PUBLIC_BIN= ${RESTRICTED}
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-roscpp-core/depend.mk
-include ../../simulation/gazebo-ros-pkgs/depend.mk
+include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
diff --git a/pal-gazebo-worlds/depend.mk b/pal-gazebo-worlds/depend.mk
index 534ea5c624265a1b5cc7df587696d67ca665776c..95b3ec3a0e32f0059f6f11b2a4b33107ff18d73f 100644
--- a/pal-gazebo-worlds/depend.mk
+++ b/pal-gazebo-worlds/depend.mk
@@ -13,16 +13,14 @@ ifeq (+,$(PAL_GAZEBO_WORLDS_DEPEND_MK)) # ---------------------------------
PREFER.pal-gazebo-worlds?= robotpkg
-SYSTEM_SEARCH.pal-gazebo-worlds=\
- 'lib/pkgconfig/pal_gazebo_worlds.pc:/Version/s/[^0-9.]//gp'
-
DEPEND_USE+= pal-gazebo-worlds
-DEPEND_ABI.pal-gazebo-worlds?=\
- pal-gazebo-worlds>=2.0.8
-DEPEND_DIR.pal-gazebo-worlds?=\
- ../../wip/pal-gazebo-worlds
+DEPEND_ABI.pal-gazebo-worlds?= pal-gazebo-worlds>=2.0.0
+DEPEND_DIR.pal-gazebo-worlds?= ../../wip/pal-gazebo-worlds
+SYSTEM_SEARCH.pal-gazebo-worlds=\
+ 'share/pal_gazebo_worlds/package.xml:/<version>/s/[^0-9.]//gp' \
+ 'share/pal_gazebo_worlds/launch/pal_gazebo.launch'
endif # PAL_GAZEBO_WORLDS_DEPEND_MK ---------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}