diff --git a/README.md b/README.md
index 0b7e42a..16963fc 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@ build dependencies calculated by brt_dep_solver
 compat-openssl10
 gcc
 icu
-libuv
 
 runtime dependencies calculated by brt_dep_solver
 -------------------------------------------------
-libuv
diff --git a/nodejs.yaml b/nodejs.yaml
index f851ef1..ecd3a07 100644
--- a/nodejs.yaml
+++ b/nodejs.yaml
@@ -1,53 +1,63 @@
+---
 document: modulemd
-version: 1
+version: 2
 data:
-    summary: Javascript runtime
-    description: >-
-        Node.js is a platform built on Chrome''s JavaScript runtime
-        for easily building fast, scalable network applications.
-        Node.js uses an event-driven, non-blocking I/O model that
-        makes it lightweight and efficient, perfect for data-intensive
-        real-time applications that run across distributed devices.
-    license:
-        module: MIT
-    dependencies:
-        buildrequires:
-            # http-parser, libuv, c-ares and V8 are bundled
-            # openssl, icu and zlib should be provided by platform
-            platform: master
-            python2: master
-        requires:
-            platform: master
-            python2: master
-    references:
-        community: http://nodejs.org
-        documentation: http://nodejs.org/en/docs
-        github: http://github.com/nodejs/node
-        npm: http://npmjs.com
-    profiles:
-        default:
-            rpms:
-                - nodejs
-                - npm
-        development:
-            rpms:
-                - nodejs
-                - nodejs-devel
-                - npm
-        minimal:
-            rpms:
-                - nodejs
-    api:
-        rpms:
-            - nodejs
-            - nodejs-devel
-            - npm
-    components:
-        rpms:
-            nodejs:
-                rationale: Javascript runtime and npm package manager.
-                buildorder: 10
-                ref: d54471
-            nodejs-packaging:
-                rationale: Runtime dependency of nodejs-devel.
-                buildorder: 10
+  summary: Javascript runtime
+  description: >-
+    Node.js is a platform built on Chrome''s JavaScript runtime for easily building
+    fast, scalable network applications. Node.js uses an event-driven, non-blocking
+    I/O model that makes it lightweight and efficient, perfect for data-intensive
+    real-time applications that run across distributed devices.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [ f30, f29, f28 ]
+    requires:
+      platform: [ f30, f29, f28 ]
+  references:
+    community: http://nodejs.org
+    documentation: http://nodejs.org/en/docs
+    tracker: https://github.com/nodejs/node/issues
+  profiles:
+    default:
+      rpms:
+      - nodejs
+      - npm
+    development:
+      rpms:
+      - nodejs
+      - nodejs-devel
+      - npm
+    minimal:
+      rpms:
+      - nodejs
+  api:
+    rpms:
+    - nodejs
+    - nodejs-devel
+    - npm
+  components:
+    rpms:
+      c-ares:
+        rationale: Required for DNS support
+        ref: master
+        buildorder: 0
+      libuv:
+        rationale: Platform abstraction layer for Node.js
+        ref: 1
+        buildorder: 0
+      http-parser:
+        rationale: Needed for parsing HTTP requests
+        ref: master
+        buildorder: 0
+      nghttp2:
+        rationale: Needed for HTTP2 support
+        ref: master
+        buildorder: 0
+      nodejs:
+        rationale: Javascript runtime and npm package manager.
+        ref: 8
+        buildorder: 10
+...