diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..44990c4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.mbs_local_build.db
diff --git a/tomcat.yaml b/tomcat.yaml
index 8d80475..4e28bdc 100644
--- a/tomcat.yaml
+++ b/tomcat.yaml
@@ -1,51 +1,42 @@
 document: modulemd
-version: 1
+version: 2
 data:
-    summary: tomcat module
-    description: This tomcat module has been generated.
+    summary: Apache Servlet/JSP Engine, RI for Servlet 4.0/JSP 2.3 API
+    description: >-
+        Tomcat is the servlet container that is used in the official Reference
+        Implementation for the Java Servlet and JavaServer Pages technologies.
+        The Java Servlet and JavaServer Pages specifications are developed by
+        Sun under the Java Community Process.
     license:
         module:
             - MIT
     dependencies:
-        buildrequires:
-            bootstrap: master
-        requires:
-            platform: master
-            java: master
-            apache-commons: master
-    references:
-        community: https://docs.pagure.org/modularity/
-        documentation: https://github.com/modularity-modules/tomcat
-        tracker: https://github.com/modularity-modules/tomcat
+        - buildrequires:
+              platform: []
+          requires:
+              platform: []
+              javapackages-tools: []
     api:
         rpms:
             - tomcat
             - tomcat-el-3.0-api
             - tomcat-jsp-2.3-api
-            - tomcatjss
             - tomcat-lib
-            - tomcat-servlet-3.1-api
+            - tomcat-servlet-4.0-api
     profiles:
         default:
-            description: A generated profile based on top-lvl package list.
+            description: A minimal tomcat installation.
             rpms:
                 - tomcat
                 - tomcat-el-3.0-api
                 - tomcat-jsp-2.3-api
-                - tomcatjss
                 - tomcat-lib
-                - tomcat-servlet-3.1-api
+                - tomcat-servlet-4.0-api
     components:
         rpms:
             ecj:
-                rationale: Generated.
-                ref: f27
-            jss:
-                rationale: Generated.
-                ref: f27
+                rationale: Required for building JSPs at Runtime.
+                ref: master
             tomcat:
-                rationale: Generated.
-                ref: f27
-            tomcatjss:
-                rationale: Generated.
-                ref: f27
+                rationale: Provides core server functionality.
+                ref: master