diff --git a/eclipse.yaml b/eclipse.yaml
index bcb2360..3387628 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -12,6 +12,7 @@ data:
             - MIT
     dependencies:
         - buildrequires:
+              eclipse: [2019-06]
               tycho: [1.4]
               platform: []
           requires:
@@ -253,13 +254,11 @@ data:
     buildopts:
         rpms:
             macros: |
-                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
                 %_without_spring 1
                 %_without_mylyn_epub 1
                 %_without_contrib_tools 1
-                %_without_photran_support 1
                 %_without_linuxtools_tests 1
                 %_without_reflections 1
                 %_without_okcurl 1
@@ -374,6 +373,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-abrt:
                 buildorder: 50
                 ref: eclipse
@@ -395,12 +400,12 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-webtools.
-#            eclipse-ecf:
-#                buildorder: 20
-#                ref: tycho
-#                arches: [x86_64, ppc64le, aarch64, s390x]
-#                rationale: >
-#                    Runtime dependency of eclipse.
+            eclipse-ecf:
+                buildorder: 30
+                ref: tycho
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse.
             eclipse-egit:
                 buildorder: 40
                 ref: eclipse
@@ -415,12 +420,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-#            eclipse-emf:
-#                buildorder: 10
-#                ref: tycho
-#                arches: [x86_64, ppc64le, aarch64, s390x]
-#                rationale: >
-#                    Runtime dependency of eclipse, eclipse-ecf.
+            eclipse-emf:
+                buildorder: 20
+                ref: tycho
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse, eclipse-ecf.
             eclipse-epp-logging:
                 buildorder: 40
                 ref: eclipse
@@ -445,7 +450,7 @@ data:
                     Runtime dependency of eclipse-egit, eclipse-egit-github,
                          eclipse-m2e-egit.
             eclipse-launchbar:
-                buildorder: 10
+                buildorder: 50
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -953,7 +958,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of aether-connector-okhttp,
-                         eclipse-m2e-core, okhttp.
+                         okhttp.
             plexus-archiver:
                 buildorder: 20
                 ref: eclipse
@@ -1040,7 +1045,7 @@ data:
                 rationale: >
                     Runtime dependency of eclipse-subclipse.
             swt-chart:
-                buildorder: 10
+                buildorder: 70
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >