diff --git a/classes/catkin.bbclass b/classes/catkin.bbclass
index 47f396a562d03a576b9661240b555551bd412305..b6dc0f47268d0dce02f7f324cf03c1d50444f813 100644
--- a/classes/catkin.bbclass
+++ b/classes/catkin.bbclass
@@ -33,16 +33,11 @@ ROS_BP = "${BPN}-${PV}"
 
 FILES_${PN} += "\
     ${prefix}/etc \
-    ${datadir}/${BPN}/conf \
-    ${datadir}/${BPN}/scripts \
     ${datadir}/${ROS_BPN}/conf \
     ${datadir}/${ROS_BPN}/scripts \
     "
 
 FILES_${PN}-dev += "\
-    ${datadir}/${BPN}/cmake \
-    ${datadir}/${BPN}/package.xml \
-    ${datadir}/${BPN}/*.template \
     ${datadir}/${ROS_BPN}/cmake \
     ${datadir}/${ROS_BPN}/package.xml \
     ${datadir}/${ROS_BPN}/*.template \