diff --git a/README.md b/README.md
index b9b18b4..2de8a21 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ nowhere to get them from, hence the need for this module.
 |-------|-------------|
 | ✓ YES | **Build passes** in the infra (all build deps are ok) |
 | ✓ YES | **Installs** on the Base Runtime (all runtime deps are ok) |
-| ✗ NO  | **No bootstrap** - uses only proper modules |
+| ✓ YES | **No bootstrap** - uses only proper modules |
 | ✓ YES | General **tests are in dist-git** |
 | ✓ YES | General **tests pass** |
 | ✗ NO  | Meets the **Fedora Module Packaging Guidelines** |
diff --git a/system-tools.yaml b/system-tools.yaml
index f8ffe82..b582091 100644
--- a/system-tools.yaml
+++ b/system-tools.yaml
@@ -14,19 +14,11 @@ data:
       - MIT
   dependencies:
     buildrequires:
-      # clashes with bootstrap
-      # base-runtime: f26
-      common-build-dependencies: f26
-      shared-userspace: f26
-      perl: f26
-      # ouch, needed for nano (groff and deps)
-      bootstrap: f26
+      bootstrap: master
     requires:
-      base-runtime: f26
-      shared-userspace: f26
+      platform: master
   references:
-    community: https://fedoraproject.org/wiki/Modularity
-    documentation: https://github.com/modularity-modules/system-tools
+    community: https://docs.pagure.org/modularity/
     tracker: https://github.com/modularity-modules/system-tools
   profiles:
     default:
@@ -34,7 +26,8 @@ data:
         - calc
         - dateutils
         - gcal
-        - nano
+        - mlocate
+        - screen
   filter:
     rpms:
       - calc-devel
@@ -43,18 +36,22 @@ data:
       - calc
       - dateutils
       - gcal
-      - nano
+      - mlocate
+      - screen
   components:
     rpms:
       calc:
-        rationale: command-line calculator.
-        ref: f26
+        rationale: A command-line calculator.
+        ref: master
       dateutils:
-        rationale: command-line date and time math.
-        ref: f26
+        rationale: A command-line utility for date and time calculation.
+        ref: master
       gcal:
-        rationale: better command-line calendar utility.
-        ref: f26
-      nano:
-        rationale: like Canada for editor wars.
-        ref: f26
+        rationale: A command-line calendar utility.
+        ref: master
+      mlocate:
+        rationale: A utility for finding files.
+        ref: master
+      screen:
+        rationale: A screen manager supporting multiple logins on one terminal.
+        ref: master