diff --git a/tools/version.sh b/tools/version.sh
index 50f066b2c..922d450c7 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -124,18 +124,18 @@ perl -pi -e '
 		$seen_version = 1 if (!/<\?xml/ &&
 		s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/);
 	}
-	' org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
+	' org.eclipse.jgit.packaging/org.*.feature/feature.xml
 
 perl -pi -e '
 	s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
-	' org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+	' org.eclipse.jgit.packaging/org.*.feature/pom.xml
 
 perl -pi -e '
 	if ($ARGV ne $old_argv) {
 		$seen_version = 0;
 		$old_argv = $ARGV;
 	}
-	if ($seen_version < 3) {
+	if ($seen_version < 4) {
 		$seen_version++ if
 		s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
 	}