diff --git a/clone_rpms.sh b/clone_rpms.sh
index b21c525..4e71537 100755
--- a/clone_rpms.sh
+++ b/clone_rpms.sh
@@ -11,8 +11,8 @@ rm -f need_branch
 for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do
 	if [ ! -d "$pkg" ] ; then
 		fedpkg clone $pkg
-		(cd $pkg ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi)
 	fi
+	(cd $pkg ; git pull ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi)
 done
 
 popd 2>&1 >/dev/null
diff --git a/eclipse.yaml b/eclipse.yaml
index 3621b88..387fa00 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -263,6 +263,7 @@ data:
                 %_without_photran_support 1
                 %_without_reflections 1
                 %_without_okcurl 1
+                %_without_snappy 1
     components:
         rpms:
             aether-connector-okhttp:
@@ -316,7 +317,7 @@ data:
                     Runtime dependency of docker-client-java, eclipse-m2e-core,
                          eclipse-mylyn, eclipse-webtools, velocity.
             apache-sshd:
-                buildorder: 10
+                buildorder: 20
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -356,8 +357,8 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of docker-client-java, eclipse-jgit,
-                         jython, okhttp.
+                    Runtime dependency of apache-sshd, docker-client-java,
+                         eclipse-jgit, jython, okhttp.
             closure-compiler:
                 buildorder: 20
                 ref: eclipse
@@ -517,7 +518,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-jgit.
+                    Runtime dependency of apache-sshd, eclipse-jgit.
             felix-gogo-command:
                 buildorder: 20
                 ref: eclipse
@@ -726,7 +727,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of jython.
+                    Runtime dependency of jython, rhino.
             jna:
                 buildorder: 10
                 ref: eclipse
@@ -820,6 +821,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core.
+            maven-filtering:
+                buildorder: 20
+                ref: master
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of maven-war-plugin.
             maven-indexer:
                 buildorder: 20
                 ref: eclipse
@@ -870,12 +877,31 @@ data:
                 rationale: >
                     Runtime dependency of aether-connector-okhttp,
                          eclipse-m2e-core, okhttp.
+            plexus-build-api:
+                buildorder: 10
+                ref: master
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse-m2e-core, maven-filtering.
+            plexus-velocity:
+                buildorder: 30
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse-m2e-core,
+                         maven-archetype.
             protobuf:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of closure-compiler.
+            rhino:
+                buildorder: 20
+                ref: master
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse-webtools.
             rxtx:
                 buildorder: 10
                 ref: eclipse