diff --git a/eclipse.yaml b/eclipse.yaml
index 9e7fbd2..9f4c63c 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -13,8 +13,11 @@ data:
     dependencies:
         - buildrequires:
               tycho: ["1.4"]
+              eclipse: ["latest"]
               platform: ["-f28", "-f29"]
           requires:
+              ant: ["1.10"]
+              maven: ["3.5"]
               platform: ["-f28", "-f29"]
     profiles:
         everything:
@@ -216,7 +219,6 @@ data:
     buildopts:
         rpms:
             macros: |
-                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
                 %_without_spring 1
@@ -324,6 +326,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-linuxtools.
+            eclipse:
+                buildorder: 40
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-cdt:
                 buildorder: 70
                 ref: eclipse
@@ -339,6 +347,12 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-webtools.
+            eclipse-ecf:
+                buildorder: 30
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse.
             eclipse-egit:
                 buildorder: 50
                 ref: eclipse
@@ -353,6 +367,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
+            eclipse-emf:
+                buildorder: 20
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse, eclipse-ecf.
             eclipse-gef:
                 buildorder: 30
                 ref: eclipse