diff --git a/ros-gencpp/depend.mk b/ros-gencpp/depend.mk
index 4705a116f3e6ade3f3dd25d0b87a0fd493eb9d56..53eed38fb011c9e80d164deca9decfd090824eb8 100644
--- a/ros-gencpp/depend.mk
+++ b/ros-gencpp/depend.mk
@@ -20,7 +20,7 @@ DEPEND_DIR.ros-gencpp?=	../../wip/ros-gencpp
 
 SYSTEM_SEARCH.ros-gencpp=\
 	bin/gen_cpp.py						\
-	'share/gencpp/stack.xml:<version>/s/[^0-9.]//gp'	\
+	'share/gencpp/stack.xml:/<version>/s/[^0-9.]//gp'	\
 	'lib/pkgconfig/gencpp.pc:/Version/s/[^0-9.]//gp'
 
 endif # ROS_GENCPP_DEPEND_MK -----------------------------------------------
diff --git a/ros-genlisp/depend.mk b/ros-genlisp/depend.mk
index 0e9404868da920497c4a90f4054fb37560ff96b7..26fc7c0058f4cbd1e51f87e836d71ab1c4de5534 100644
--- a/ros-genlisp/depend.mk
+++ b/ros-genlisp/depend.mk
@@ -19,8 +19,8 @@ DEPEND_ABI.ros-genlisp?=ros-genlisp>=0.3.3
 DEPEND_DIR.ros-genlisp?=../../wip/ros-genlisp
 
 SYSTEM_SEARCH.ros-genlisp=\
-	bin/gen_lisp.py					\
-	'share/genlisp/stack.xml:<version>/s/[^0-9.]//gp'	\
+	bin/gen_lisp.py						\
+	'share/genlisp/stack.xml:/<version>/s/[^0-9.]//gp'	\
 	'lib/pkgconfig/genlisp.pc:/Version/s/[^0-9.]//gp'
 
 endif # ROS_GENLISP_DEPEND_MK ----------------------------------------------
diff --git a/ros-genmsg/depend.mk b/ros-genmsg/depend.mk
index 4bd1d5bf6369ec421582da0fd51625205310329b..098455c2093e8c7689a8a563be168edb647111d6 100644
--- a/ros-genmsg/depend.mk
+++ b/ros-genmsg/depend.mk
@@ -19,7 +19,7 @@ DEPEND_ABI.ros-genmsg?=	ros-genmsg>=0.3.10
 DEPEND_DIR.ros-genmsg?=	../../wip/ros-genmsg
 
 SYSTEM_SEARCH.ros-genmsg=\
-	'share/genmsg/stack.xml:<version>/s/[^0-9.]//gp'	\
+	'share/genmsg/stack.xml:/<version>/s/[^0-9.]//gp'	\
 	'lib/pkgconfig/genmsg.pc:/Version/s/[^0-9.]//gp'
 
 endif # ROS_GENMSG_DEPEND_MK -----------------------------------------------
diff --git a/ros-genpy/depend.mk b/ros-genpy/depend.mk
index 75ffef3cb6097e2e3b045418469a92cf684b17ce..5146afbdb2b6cc4881a23eb78b2b28c8487e08f7 100644
--- a/ros-genpy/depend.mk
+++ b/ros-genpy/depend.mk
@@ -19,8 +19,8 @@ DEPEND_ABI.ros-genpy?=	ros-genpy>=0.3.4
 DEPEND_DIR.ros-genpy?=	../../wip/ros-genpy
 
 SYSTEM_SEARCH.ros-genpy=\
-	bin/genmsg_py.py				\
-	'share/genpy/stack.xml:<version>/s/[^0-9.]//gp'	\
+	bin/genmsg_py.py					\
+	'share/genpy/stack.xml:/<version>/s/[^0-9.]//gp'	\
 	'lib/pkgconfig/genpy.pc:/Version/s/[^0-9.]//gp'
 
 endif # ROS_GENPY_DEPEND_MK ------------------------------------------------
diff --git a/ros-langs-dev/depend.mk b/ros-langs-dev/depend.mk
index 7b0239d5c62e44381c14886dc12b681608dd9d87..b706edd828709923011103baea68f54ec0fa85c5 100644
--- a/ros-langs-dev/depend.mk
+++ b/ros-langs-dev/depend.mk
@@ -19,7 +19,7 @@ DEPEND_ABI.ros-langs-dev?=ros-langs-dev>=0.1.3
 DEPEND_DIR.ros-langs-dev?=../../wip/ros-langs-dev
 
 SYSTEM_SEARCH.ros-langs-dev=\
-	'share/langs-dev/stack.xml:<version>/s/[^0-9.]//gp'	\
+	'share/langs-dev/stack.xml:/<version>/s/[^0-9.]//gp'	\
 	'lib/pkgconfig/langs-dev.pc:/Version/s/[^0-9.]//gp'
 
 endif # ROS_LANGS_DEV_DEPEND_MK --------------------------------------------
diff --git a/ros-langs/depend.mk b/ros-langs/depend.mk
index 17693aec95ac37cc9504b2e0fa92075a4b78a778..1578092f7c97a57cae2e2b052b7d89918a8dc5cd 100644
--- a/ros-langs/depend.mk
+++ b/ros-langs/depend.mk
@@ -19,7 +19,7 @@ DEPEND_ABI.ros-langs?=	ros-langs>=0.3.5
 DEPEND_DIR.ros-langs?=	../../wip/ros-langs
 
 SYSTEM_SEARCH.ros-langs=\
-	'share/langs/stack.xml:<version>/s/[^0-9.]//gp'	\
+	'share/langs/stack.xml:/<version>/s/[^0-9.]//gp'	\
 	'lib/pkgconfig/langs.pc:/Version/s/[^0-9.]//gp'
 
 endif # ROS_LANGS_DEPEND_MK ------------------------------------------------
diff --git a/ros-std-msgs/depend.mk b/ros-std-msgs/depend.mk
index 2b3247d42f4ce1220c350641b7fcc33a9851e526..78f418f877d4da6690c7d596d71e0350b38f8ac9 100644
--- a/ros-std-msgs/depend.mk
+++ b/ros-std-msgs/depend.mk
@@ -22,8 +22,8 @@ SYSTEM_SEARCH.ros-std-msgs=\
 	include/std_msgs/Int32.h				\
 	'${PYTHON_SYSLIBSEARCH}/std_msgs/msg/_Int32.py'		\
 	share/common-lisp/ros/std_msgs/msg/Int32.lisp		\
-	'share/std-msgs/stack.xml:<version>/s/[^0-9.]//gp'	\
-	'lib/pkgconfig/std-msgs.pc:/Version/s/[^0-9.]//gp'
+	'share/std_msgs/stack.xml:/<version>/s/[^0-9.]//gp'	\
+	'lib/pkgconfig/std_msgs.pc:/Version/s/[^0-9.]//gp'
 
 endif # ROS_STD_MSGS_DEPEND_MK ---------------------------------------------