diff --git a/integrate_into_manifest.py b/integrate_into_manifest.py
index 72d8f3406191bce4f41cd1c4252bda32f14a2775..ebc844ed044dcfa4d01bb11acc000b9d005c9752 100755
--- a/integrate_into_manifest.py
+++ b/integrate_into_manifest.py
@@ -54,17 +54,17 @@ def integrate_into_manifest(
         except FileNotFoundError:
             sys.exit("ERROR: file '%s' not found in manifest repo" % manifest_file)
 
-        # Find project references in manifest
-        # We're using XPath's substring function here to test if the name attribute
-        # ends on the project name. This adds suport for sub-projects as well
-        # (e.g."mygroup/myproject", when only "myproject" is given).
-        project_nodes = manifest.findall(
-            "project[substring(@name, string-length(@name)-string-length('%s')+1)='%s']"
-            % (project.path, project.path)
-        )
-        if not project_nodes:
+        # Find project reference in manifest
+        # We are using str.endswith() for this in order to support sub-projects as well
+        # (e.g."mygroup/myproject", when only "myproject" is given)
+        project_node = None
+        project_nodes = manifest.findall("project")
+        for node in project_nodes:
+            name = node.get("name")
+            if name is not None and name.endswith(project.path):
+                project_node = node
+        if project_node is None:
             sys.exit("ERROR: project '%s' not found in manifest" % project.path)
-        project_node = project_nodes[0]
 
         # Get current project revision from manifest
         old_revision = project_node.get("revision")