diff --git a/mongodb.yaml b/mongodb.yaml
index 1c1fb5e..e602171 100644
--- a/mongodb.yaml
+++ b/mongodb.yaml
@@ -41,6 +41,10 @@ data:
         rpms:
                 - mongodb
                 - mongodb-server
+    buildopts:
+        rpms:
+            macros: |
+                %with_bundled 1
     components:
         rpms:
             mongodb:
@@ -51,4 +55,7 @@ data:
                 rationale: Python MongoDB driver | MongoDB dependecy for running testsuite.
                 ref: f28
                 buildorder: 3
-
+            mongo-tools:
+                rationale: MongoDB tools.
+                ref: 3.6
+                buildorder: 2