diff --git a/koschei.cfg b/koschei.cfg
index fbc4850..d3b2d5b 100644
--- a/koschei.cfg
+++ b/koschei.cfg
@@ -3,17 +3,14 @@
 config = {
     "buildrequires": [
         "javapackages-tools",
-        "java",
-        "platform",
     ],
     "requires": [
-        "java",
         "platform",
     ],
 
     "bootstrap": False,
-    "full_refs": True,
-    "default_ref": None,
+    "full_refs": False,
+    "default_ref": "javapackages",
     "include_build_deps": False,
     "closure": False,
     "filter_unused": True,
@@ -35,11 +32,13 @@ config = {
         "java-1.8.0-openjdk",
     ],
     "frozen_refs": [
-        "python-lxml",
     ],
     "stream_override": {
-        "java": {
-            "f27": "8",
+        "javapackages-tools": {
+            "3.5": "[201801]",
+        },
+        "platform": {
+            "3.5": "[]",
         },
     },
 
@@ -51,6 +50,7 @@ config = {
         "_without_cython": 1,
         "_without_dafsa": 1,
         "_without_desktop": 1,
+        "_without_dom4j": 1,
         "_without_doxygen": 1,
         "_without_dtd": 1,
         "_without_eclipse": 1,
@@ -68,6 +68,7 @@ config = {
         "_without_jmh": 1,
         "_without_jna": 1,
         "_without_jpa": 1,
+        "_without_junit5": 1,
         "_without_logback": 1,
         "_without_markdown": 1,
         "_without_memcached": 1,
@@ -76,25 +77,27 @@ config = {
         "_without_python": 1,
         "_without_reporting": 1,
         "_without_scm": 1,
+        "_without_snakeyaml": 1,
         "_without_snappy": 1,
         "_without_spring": 1,
         "_without_ssh": 1,
         "_without_testlib": 1,
+        "_without_vfs": 1,
     },
 
     "summary": "Java project management and project comprehension tool",
-    "description": [
-        "Maven is a software project management and comprehension tool.",
-        "Based on the concept of a project object model (POM), Maven",
-        "can manage a project's build, reporting and documentation from",
-        "a central piece of information.",
-    ],
+    "description": """\
+        Maven is a software project management and comprehension tool.
+        Based on the concept of a project object model (POM), Maven
+        can manage a project's build, reporting and documentation from
+        a central piece of information.
+    """,
 
     "koji_config": {
-        "server": "https://koji.lbzip2.org/kojihub",
-        "topurl": "https://koji.lbzip2.org/kojifiles",
+        "server": "https://koji.kjnet.xyz/kojihub",
+        "topurl": "https://koji.kjnet.xyz/kojifiles",
         "multicall_chunk_size": 1000,
-        "tag_name": "module",
+        "tag_name": "jp-201801",
     },
     "dependency": {
         "repo_arch": "x86_64",
diff --git a/maven.yaml b/maven.yaml
index 0c9f8f1..592f853 100644
--- a/maven.yaml
+++ b/maven.yaml
@@ -13,7 +13,8 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-              javapackages-tools: [master]
+              javapackages-tools: [201801]
+              platform: [f30]
           requires:
               platform: []
     profiles:
@@ -35,10 +36,9 @@ data:
             - atinject-tck
             - cdi-api-javadoc
             - geronimo-annotation-javadoc
-            - glassfish-el
-            - glassfish-el-javadoc
             - google-guice-javadoc
-            - guava-javadoc
+            - guava20-javadoc
+            - guava20-testlib
             - guice-assistedinject
             - guice-bom
             - guice-extensions
@@ -52,12 +52,10 @@ data:
             - guice-throwingproviders
             - hawtjni
             - hawtjni-javadoc
-            - httpcomponents-client-cache
             - httpcomponents-client-javadoc
             - httpcomponents-core-javadoc
             - jansi-javadoc
             - jansi-native-javadoc
-            - jboss-interceptors-1.2-api-javadoc
             - jsoup-javadoc
             - jul-to-slf4j
             - log4j-over-slf4j
@@ -67,8 +65,6 @@ data:
             - maven-resolver-javadoc
             - maven-resolver-test-util
             - maven-resolver-transport-classpath
-            - maven-resolver-transport-file
-            - maven-resolver-transport-http
             - maven-shared-utils-javadoc
             - maven-wagon
             - maven-wagon-ftp
@@ -103,6 +99,7 @@ data:
                 %_without_cython 1
                 %_without_dafsa 1
                 %_without_desktop 1
+                %_without_dom4j 1
                 %_without_doxygen 1
                 %_without_dtd 1
                 %_without_eclipse 1
@@ -120,6 +117,7 @@ data:
                 %_without_jmh 1
                 %_without_jna 1
                 %_without_jpa 1
+                %_without_junit5 1
                 %_without_logback 1
                 %_without_markdown 1
                 %_without_memcached 1
@@ -128,199 +126,166 @@ data:
                 %_without_python 1
                 %_without_reporting 1
                 %_without_scm 1
+                %_without_snakeyaml 1
                 %_without_snappy 1
                 %_without_spring 1
                 %_without_ssh 1
                 %_without_testlib 1
+                %_without_vfs 1
     components:
         rpms:
-            # aopalliance-1.0-15.fc28
             aopalliance:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of google-guice, maven.
-            # apache-commons-cli-1.4-2.fc28
             apache-commons-cli:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # apache-commons-codec-1.11-1.fc28
             apache-commons-codec:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of httpcomponents-client, maven.
-            # apache-commons-io-2.6-1.fc28
             apache-commons-io:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven, maven-shared-utils,
                          maven-wagon.
-            # apache-commons-lang3-3.7-1.fc28
             apache-commons-lang3:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # apache-commons-logging-1.2-11.fc28
             apache-commons-logging:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of httpcomponents-client, maven.
-            # atinject-1-25.20100611svn86.fc28
             atinject:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of cdi-api, google-guice, maven.
-            # cdi-api-1.2-6.fc28
             cdi-api:
                 buildorder: 20
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven, sisu.
-            # geronimo-annotation-1.0-21.fc28
             geronimo-annotation:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # glassfish-el-3.0.1-0.6.b08.fc28
             glassfish-el:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of cdi-api.
-            # google-guice-4.1-8.fc28
             google-guice:
                 buildorder: 20
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # guava-18.0-11.fc28
-            guava:
+            guava20:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of google-guice, maven.
-            # hawtjni-1.15-2.fc28
             hawtjni:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of jansi, jansi-native, maven.
-            # httpcomponents-client-4.5.3-4.fc28
             httpcomponents-client:
                 buildorder: 20
-                ref: master
+                ref: javapackages
                 rationale: >
-                    Runtime dependency of maven, maven-wagon.
-            # httpcomponents-core-4.4.9-1.fc28
+                    Runtime dependency of maven, maven-resolver,
+                         maven-wagon.
             httpcomponents-core:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of httpcomponents-client, maven,
-                         maven-wagon.
-            # jansi-1.16-2.fc28
+                         maven-resolver, maven-wagon.
             jansi:
                 buildorder: 30
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # jansi-native-1.7-3.fc28
             jansi-native:
                 buildorder: 20
-                ref: master
-                multilib: []
+                ref: javapackages
                 rationale: >
                     Runtime dependency of jansi, maven.
-            # jboss-interceptors-1.2-api-1.0.0-7.fc28
-            jboss-interceptors-1.2-api:
-                buildorder: 10
-                ref: master
-                rationale: >
-                    Runtime dependency of cdi-api.
-            # jsoup-1.11.2-1.fc28
             jsoup:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven-wagon.
-            # maven-3.5.2-1.fc28
             maven:
                 buildorder: 50
-                ref: master
+                ref: javapackages
                 rationale: >
                     Module API.
-            # maven-resolver-1.1.0-2.fc28
             maven-resolver:
                 buildorder: 40
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # maven-shared-utils-3.1.0-5.fc28
             maven-shared-utils:
                 buildorder: 20
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # maven-wagon-3.0.0-1.fc28
             maven-wagon:
                 buildorder: 30
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven, maven-resolver.
-            # plexus-cipher-1.7-13.fc28
             plexus-cipher:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven, plexus-sec-dispatcher.
-            # plexus-classworlds-2.5.2-8.fc28
             plexus-classworlds:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven, sisu.
-            # plexus-containers-1.7.1-3.fc28
             plexus-containers:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven, sisu.
-            # plexus-interpolation-1.22-8.fc28
             plexus-interpolation:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # plexus-sec-dispatcher-1.4-23.fc28
             plexus-sec-dispatcher:
                 buildorder: 20
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # plexus-utils-3.0.24-4.fc28
             plexus-utils:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven, maven-wagon,
                          plexus-sec-dispatcher, sisu.
-            # sisu-0.3.3-2.fc28
             sisu:
                 buildorder: 30
-                ref: master
+                ref: javapackages
                 rationale: >
                     Runtime dependency of maven.
-            # slf4j-1.7.25-2.fc28
             slf4j:
                 buildorder: 10
-                ref: master
+                ref: javapackages
                 rationale: >
-                    Runtime dependency of maven, maven-wagon.
+                    Runtime dependency of maven, maven-resolver,
+                         maven-wagon.