diff --git a/eclipse.yaml b/eclipse.yaml
index 4ba341b..a973d8e 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -21,14 +21,17 @@ data:
     profiles:
         default:
             rpms:
+                - eclipse-abrt
                 - eclipse-jdt
                 - eclipse-mpc
                 - eclipse-usage
     api:
         rpms:
+            - eclipse-abrt
             - eclipse-cdt-native
             - eclipse-dtp
             - eclipse-egit
+            - eclipse-egit-github
             - eclipse-egit-mylyn
             - eclipse-epp-logging
             - eclipse-gef
@@ -37,10 +40,12 @@ data:
             - eclipse-launchbar
             - eclipse-mpc
             - eclipse-pde
+            - eclipse-pydev
             - eclipse-subclipse
             - eclipse-tm-terminal
             - eclipse-usage
             - freemarker
+            - glassfish-jaxb-runtime
             - nekohtml
             - rxtx
             - swt-chart
@@ -57,6 +62,7 @@ data:
             - args4j-javadoc
             - args4j-parent
             - args4j-tools
+            - base64coder-javadoc
             - batik-demo
             - batik-javadoc
             - batik-rasterizer
@@ -85,7 +91,6 @@ data:
             - eclipse-mylyn-docs-epub
             - eclipse-mylyn-docs-wikitext
             - eclipse-mylyn-sdk
-            - eclipse-mylyn-tasks-bugzilla
             - eclipse-mylyn-tasks-trac
             - eclipse-mylyn-tasks-web
             - eclipse-mylyn-tests
@@ -93,7 +98,9 @@ data:
             - eclipse-mylyn-versions-cvs
             - eclipse-mylyn-versions-git
             - eclipse-mylyn-versions-subclipse
+            - eclipse-pydev-mylyn
             - eclipse-tm-terminal-connectors
+            - eclipse-tm-terminal-rse
             - eclipse-tm-terminal-sdk
             - ed25519-java-javadoc
             - felix-gogo-command-javadoc
@@ -130,6 +137,10 @@ data:
             - jakarta-commons-httpclient-javadoc
             - jakarta-commons-httpclient-manual
             - javaewah-javadoc
+            - jctools-channels
+            - jctools-experimental
+            - jctools-javadoc
+            - jctools-parent
             - jetty
             - jetty-alpn-client
             - jetty-alpn-server
@@ -181,11 +192,22 @@ data:
             - jetty-websocket-server
             - jetty-websocket-servlet
             - jetty-xml
+            - jffi-javadoc
             - jgit-javadoc
+            - jline-javadoc
             - jna-javadoc
+            - jnr-constants-javadoc
+            - jnr-enxio-javadoc
+            - jnr-ffi-javadoc
+            - jnr-netdb-javadoc
+            - jnr-posix-javadoc
+            - jnr-unixsocket-javadoc
+            - jnr-x86asm-javadoc
             - jsch-agent-proxy-javadoc
             - jsch-agent-proxy-jsch
             - jsch-agent-proxy-sshj
+            - jython-demo
+            - jython-javadoc
             - kxml-javadoc
             - lpg
             - lpg-java
@@ -217,9 +239,11 @@ data:
             - lucene-test-framework
             - nekohtml-demo
             - nekohtml-javadoc
+            - netty-javadoc
             - objectweb-asm-javadoc
             - sac-javadoc
             - sequence-library-javadoc
+            - snakeyaml-javadoc
             - sqljet-javadoc
             - stringtemplate-javadoc
             - svnkit-cli
@@ -230,7 +254,6 @@ data:
             - wsdl4j-javadoc
             - xmlgraphics-commons-javadoc
             - xmlrpc-javadoc
-            - xmlrpc-server
             - xpp3-javadoc
             - xpp3-minimal
     buildopts:
@@ -239,6 +262,8 @@ data:
                 %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
+                %_without_spring 1
+                %_without_mylyn_epub 1
                 %_without_contrib_tools 1
                 %_without_remote 1
     components:
@@ -248,13 +273,13 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of sqljet.
+                    Runtime dependency of eclipse-pydev, jython, sqljet.
             apache-commons-compress:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-jgit.
+                    Runtime dependency of eclipse-jgit, jython.
             apache-commons-el:
                 buildorder: 10
                 ref: eclipse
@@ -283,6 +308,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-jgit.
+            base64coder:
+                buildorder: 10
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of snakeyaml.
             batik:
                 buildorder: 20
                 ref: eclipse
@@ -293,7 +324,13 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-jgit.
+                    Runtime dependency of eclipse-jgit, jython.
+            eclipse-abrt:
+                buildorder: 50
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-cdt:
                 buildorder: 60
                 ref: eclipse
@@ -313,14 +350,21 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-tm-terminal.
+                    Runtime dependency of eclipse-egit-github,
+                         eclipse-tm-terminal.
+            eclipse-egit-github:
+                buildorder: 50
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-epp-logging:
                 buildorder: 40
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-usage.
+                    Runtime dependency of eclipse-abrt, eclipse-usage.
             eclipse-gef:
                 buildorder: 10
                 ref: eclipse
@@ -334,7 +378,8 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-egit.
+                    Runtime dependency of eclipse-egit,
+                         eclipse-egit-github.
             eclipse-launchbar:
                 buildorder: 10
                 ref: eclipse
@@ -352,8 +397,15 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-dltk, eclipse-egit,
-                         eclipse-epp-logging, eclipse-subclipse.
+                    Runtime dependency of eclipse-abrt, eclipse-egit,
+                         eclipse-egit-github, eclipse-epp-logging,
+                         eclipse-subclipse.
+            eclipse-pydev:
+                buildorder: 50
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-remote:
                 buildorder: 70
                 ref: eclipse
@@ -372,7 +424,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-dltk, eclipse-remote.
+                    Runtime dependency of eclipse-remote.
             eclipse-usage:
                 buildorder: 50
                 ref: eclipse
@@ -423,7 +475,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-cdt.
+                    Module API.
             glassfish-jaxb-api:
                 buildorder: 10
                 ref: eclipse
@@ -452,13 +504,14 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-cdt, eclipse-epp-logging,
-                         eclipse-jgit.
+                    Runtime dependency of eclipse-cdt, eclipse-egit-github,
+                         eclipse-epp-logging, eclipse-jgit, eclipse-mylyn.
             icu4j:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
+                    Runtime dependency of jython.
             jakarta-commons-httpclient:
                 buildorder: 10
                 ref: eclipse
@@ -471,24 +524,92 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-jgit.
+            jctools:
+                buildorder: 10
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jython, netty.
             jetty:
                 buildorder: 20
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-jgit.
+            jffi:
+                buildorder: 10
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jnr-ffi, jython.
+            jline:
+                buildorder: 10
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jython.
             jna:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jsch-agent-proxy, svnkit.
+            jnr-constants:
+                buildorder: 10
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jnr-enxio, jnr-posix,
+                         jnr-unixsocket, jython.
+            jnr-enxio:
+                buildorder: 30
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse-abrt, jnr-unixsocket.
+            jnr-ffi:
+                buildorder: 20
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jnr-enxio, jnr-netdb, jnr-posix,
+                         jnr-unixsocket, jython.
+            jnr-netdb:
+                buildorder: 30
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jython.
+            jnr-posix:
+                buildorder: 30
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jnr-unixsocket, jython.
+            jnr-unixsocket:
+                buildorder: 40
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse-abrt.
+            jnr-x86asm:
+                buildorder: 10
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jnr-ffi.
             jsch-agent-proxy:
                 buildorder: 20
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of svnkit.
+            jython:
+                buildorder: 40
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse-pydev.
             kxml:
                 buildorder: 20
                 ref: eclipse
@@ -500,25 +621,31 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-cdt, eclipse-dtp.
+                    Runtime dependency of eclipse-dtp.
             lucene:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-dltk, eclipse-dtp,
-                         eclipse-mylyn.
+                    Runtime dependency of eclipse-dtp, eclipse-mylyn.
             nekohtml:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
+            netty:
+                buildorder: 20
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of jython.
             objectweb-asm:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
+                    Runtime dependency of jnr-ffi, jython.
             rxtx:
                 buildorder: 10
                 ref: eclipse
@@ -541,6 +668,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of svnkit.
+            snakeyaml:
+                buildorder: 20
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse-pydev.
             sqljet:
                 buildorder: 30
                 ref: eclipse
@@ -576,7 +709,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of xmlrpc.
+                    Runtime dependency of eclipse-pydev, xmlrpc.
             wsdl4j:
                 buildorder: 10
                 ref: eclipse
@@ -594,7 +727,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-mylyn.
+                    Runtime dependency of eclipse-mylyn, eclipse-pydev.
             xpp3:
                 buildorder: 10
                 ref: eclipse
diff --git a/koschei.cfg b/koschei.cfg
index 3c0598a..a209fd5 100644
--- a/koschei.cfg
+++ b/koschei.cfg
@@ -20,15 +20,11 @@ config = {
     "topo_sort": True,
 
     "api": [
+        "eclipse-abrt",
         "eclipse-cdt-native",
-        "eclipse-dltk",
-        "eclipse-dltk-mylyn",
-        "eclipse-dltk-rse",
-        "eclipse-dltk-ruby",
-        "eclipse-dltk-sh",
-        "eclipse-dltk-tcl",
         "eclipse-dtp",
         "eclipse-egit",
+        "eclipse-egit-github",
         "eclipse-egit-mylyn",
         "eclipse-epp-logging",
         "eclipse-gef",
@@ -37,6 +33,7 @@ config = {
         "eclipse-launchbar",
         "eclipse-mpc",
         "eclipse-pde",
+        "eclipse-pydev",
         "eclipse-subclipse",
         "eclipse-tm-terminal",
         "eclipse-usage",
@@ -48,6 +45,7 @@ config = {
     ],
     "profiles": {
         "default": [
+            "eclipse-abrt",
             "eclipse-jdt",
             "eclipse-mpc",
             "eclipse-usage",
@@ -81,6 +79,9 @@ config = {
         "xsom",
         # For minimal eclipse-subclipse
         "subversion",
+        # For minimal netty
+        "aalto-xml",
+        "stax2-api",
         # For bootstrap eclipse
         "eclipse",
         "eclipse-ecf",
@@ -114,6 +115,8 @@ config = {
         "_with_bootstrap": 1,
         "_with_jp_minimal": 1,
         "_without_javahl": 1,
+        "_without_spring": 1,
+        "_without_mylyn_epub": 1,
         "_without_contrib_tools": 1,
         "_without_remote": 1,
     },