diff --git a/scripts/projects.py b/scripts/projects.py
index 9240d99e..c1d113d5 100644
--- a/scripts/projects.py
+++ b/scripts/projects.py
@@ -504,10 +504,10 @@ def pkg_relations(rel_type, args_):
                         dep = dep[:1]
                     dep = map(str.strip, dep)
                     if args.no_subpackages:
-                        dep[0] = re.sub('-devel$|-run$', '', dep[0])
+                        dep[0] = re.sub('-dev$|-devel$|-run$', '', dep[0])
                     for i, item in enumerate(dep):
                         dep[i] = item.strip()
-                    if len(dep) == 3:
+                    if s == 'jw' and len(dep) == 3:
                         dep_project = re.sub(r'-devel$|-run$', '', dep[0])
                         if args.dont_expand_version_macros and dep_project in args.module:
                             version = dep[2]