diff --git a/bind.yaml b/bind.yaml
index 344cd4d..fe813d7 100644
--- a/bind.yaml
+++ b/bind.yaml
@@ -1,66 +1,76 @@
 document: modulemd
 version: 1
 data:
-    summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server.
-    description: >-
-        BIND (Berkeley Internet Name Domain) is an implementation of the DNS
-        (Domain Name System) protocols. BIND includes a DNS server (named),
-        which resolves host names to IP addresses; a resolver library
-        (routines for applications to use when interfacing with DNS); and
-        tools for verifying that the DNS server is operating properly.
+    summary: BIND Module
+
+    description: BIND (Berkeley Internet Name Domain) is an implementation of the DNS
+                 (Domain Name System) protocols. BIND includes a DNS server (named),
+                 which resolves host names to IP addresses; a resolver library
+                 (routines for applications to use when interfacing with DNS); and
+                 tools for verifying that the DNS server is operating properly.
+
     license:
         module:
             - MIT
         content:
-            - ISC
+            - MPLv2.0   # bind
+            - LGPLv2+   # GeoIP
+            - CC-BY-SA  # GeoIP-GeoLite-data
+
     dependencies:
         buildrequires:
             bootstrap: master
-            # perl: f26
-            # common-build-dependencies: f26
-            # mariadb: f26
-            # postgresql: f26
         requires:
-            bootstrap: master
-            # shared-userspace: f26
-            # base-runtime: f26
-            # perl: f26
+            platform: master
+            platform-placeholder: master
+            python3: master
+            python3-ecosystem: master
+
     references:
-        community: https://github.com/modularity-modules/bind/
-        documentation: https://github.com/modularity-modules/bind/
+        community: https://docs.pagure.org/modularity/
+        documentation: https://github.com/modularity-modules/bind
         tracker: https://github.com/modularity-modules/bind/issues
+
     profiles:
         default:
             rpms:
                 - bind
+                - bind-chroot
+                - bind-sdb
+                - bind-sdb-chroot
+                - bind-pkcs11
+                - bind-utils
+                - bind-pkcs11-utils
+                - python3-bind
+        server:
+            rpms:
+                - bind
+        client:
+            rpms:
+                - bind-utils
+
     api:
         rpms:
             - bind
             - bind-chroot
-            - bind-debuginfo
-            - bind-debugsource
-            - bind-devel
-            - bind-libs
-            - bind-libs-debuginfo
-            - bind-libs-lite
-            - bind-libs-lite-debuginfo
-            - bind-license
-            - bind-lite-devel
-            - bind-pkcs11
-            - bind-pkcs11-debuginfo
-            - bind-pkcs11-devel
-            - bind-pkcs11-libs
-            - bind-pkcs11-libs-debuginfo
-            - bind-pkcs11-utils
-            - bind-pkcs11-utils-debuginfo
             - bind-sdb
             - bind-sdb-chroot
-            - bind-sdb-debuginfo
+            - bind-pkcs11
             - bind-utils
-            - bind-utils-debuginfo
+            - bind-pkcs11-utils
             - python3-bind
+
     components:
         rpms:
             bind:
-                rationale: Primary component of this module.
+                rationale: BIND package.
+                ref: master
+                buildorder: 2
+            GeoIP:
+                rationale: Needed for GeoIP ACLs in BIND.
+                ref: master
+                buildorder: 1
+            GeoIP-GeoLite-data:
+                rationale: Geolocation data for GeoIP
                 ref: master
+                buildorder: 1