diff --git a/postgresql.yaml b/postgresql.yaml
index 98d25d7..824e63f 100644
--- a/postgresql.yaml
+++ b/postgresql.yaml
@@ -1,43 +1,44 @@
+---
 document: modulemd
-version: 1
+version: 2
 data:
-  summary: postgresql module
-  description: This postgresql module has been generated.
-  license:
-    module: [ MIT ]
-  dependencies:
-    buildrequires:
-      bootstrap: f27
-    requires:
-      platform: f27
-  references:
-    community: https://docs.pagure.org/modularity/
-    documentation: https://github.com/modularity-modules/postgresql
-    tracker: https://github.com/modularity-modules/postgresql
-  api:
-    rpms:
-      - postgresql
-      - python2-psycopg2
-      - python3-psycopg2
-  profiles:
-    default:
-      rpms:
-        - postgresql-server
-    server:
-      rpms:
-        - postgresql-server
-    client:
-      rpms:
-        - postgresql
-  filter: {}
-  components:
-    rpms:
-      postgresql:
-        rationale: Generated.
-        ref: f27
-      python-psycopg2:
-        rationale: Needed to interact with postgresql via Python
-        ref: f27
-      uuid:
-        rationale: Generated.
-        ref: f27
+    summary: PostgreSQL module
+    description: PostgreSQL is an advanced Object-Relational database
+                 management system (DBMS).
+                 The PostgreSQL server can be found in the
+                 postgresql-server sub-package.
+    license:
+        module: [MIT]
+    dependencies:
+        - buildrequires:
+              platform: []
+          requires:
+              platform: []
+    references:
+        community: https://docs.pagure.org/modularity/
+        documentation: https://www.postgresql.org/docs/
+        tracker: https://github.com/modularity-modules/postgresql
+    api:
+        rpms:
+            - postgresql
+            - postgresql-server
+    profiles:
+        default:
+            rpms:
+                - postgresql-server
+        server:
+            rpms:
+                - postgresql-server
+        client:
+            rpms:
+                - postgresql
+    filter: {}
+    buildopts:
+        rpms:
+            macros: |
+                %runselftest 0
+    components:
+        rpms:
+            postgresql:
+                rationale: main server component
+                ref: 3f21ecc4    # latest f27