diff --git a/py-prf-ros-controllers/Makefile b/py-prf-ros-controllers/Makefile
index fea94ed150c0fc2fc3846270359f1e27134d9004..c4bcdf670b932b56b5d72613b6d4a5ccd222146c 100644
--- a/py-prf-ros-controllers/Makefile
+++ b/py-prf-ros-controllers/Makefile
@@ -4,26 +4,29 @@
 
 ORG=			pal-robotics-forks
 VERSION=		0.3.15
-PRFNAME=		ros-controllers
-PKGBASE=		prf-${PRFNAME}
-PKGNAME=		${PKGTAG.python-}${PKGBASE}-${VERSION}
-DISTNAME=		${VERSION}
-ROSNAME=		$(subst -,_,${PRFNAME})
+NAME=			ros-controllers
+PKGREVISION=		2
+
+PRFNAME=		prf-${NAME}
+ROSNAME=		$(subst -,_,${NAME})
+
+PKGNAME=		${PKGTAG.python-}${PRFNAME}-${VERSION}
 WRKSRC=			${WRKDIR}/${ROSNAME}-${VERSION}
-PKGREVISION=		1
+DISTNAME=		${VERSION}
+DIST_SUBDIR=		${PRFNAME}
 
-# old package name and other Python versions
-CONFLICTS=		${PKGBBASE}-[0-9]*
-CONFLICTS+=		py[0-9][0-9]-${PKGBBASE}-[0-9]*
-CONFLICTS=		talos-ros-controllers
+# old package name, other Python versions, and forked package.
+CONFLICTS=		${PRFNAME}-[0-9]*
+CONFLICTS+=		py[0-9][0-9]-${PRFNAME}-[0-9]*
+CONFLICTS+=		${NAME}-[0-9]*
+CONFLICTS+=		talos-${NAME}-[0-9]*
 
 CATEGORIES=		wip
 
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+=	--recursive
-
 HOMEPAGE=		${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
 MASTER_SITES=		${HOMEPAGE}/archive/
+
 COMMENT=		Library of ros controllers
 LICENSE=		2-clause-bsd
 
diff --git a/py-prf-ros-controllers/distinfo b/py-prf-ros-controllers/distinfo
index 06ec3d197b8a0ce31e166da0bfd360d0515ce2ba..01ddaae4df83adcba758d5c6309e6c12bddf30e3 100644
--- a/py-prf-ros-controllers/distinfo
+++ b/py-prf-ros-controllers/distinfo
@@ -1,4 +1,4 @@
-SHA1 (0.3.15.tar.gz) = bfd6696e961f05a7a0957d2a3a28880071cd3318
-RMD160 (0.3.15.tar.gz) = 1d93e609e8d022d9d60f891dfc687fabe71e5346
-Size (0.3.15.tar.gz) = 484646 bytes
+SHA1 (prf-ros-controllers/0.3.15.tar.gz) = bfd6696e961f05a7a0957d2a3a28880071cd3318
+RMD160 (prf-ros-controllers/0.3.15.tar.gz) = 1d93e609e8d022d9d60f891dfc687fabe71e5346
+Size (prf-ros-controllers/0.3.15.tar.gz) = 484646 bytes
 SHA1 (patch-ab) = 6071abb0ea9918238ade52ebf0d145d8d8587b45