diff --git a/classes/ros-insane.bbclass b/classes/ros-insane.bbclass
index 81116dc..444fa85 100644
--- a/classes/ros-insane.bbclass
+++ b/classes/ros-insane.bbclass
@@ -4,6 +4,10 @@
 # https://github.com/ros-planning/moveit/commit/0a7a895bb2ae9e171efa101f354826366fa5eaff
 INSANE_SKIP_${PN} += "dev-so"
 
-FILES_${PN} += "\
-        ${ros_libdir}/lib*.so.* \
+FILES_${PN}_prepend_ros1-distro = " \
+    ${ros_libdir}/lib*${SOLIBS} \
+"
+
+FILES_${PN}_prepend_ros2-distro= " \
+    ${libdir}/lib*${SOLIBS} \
 "