diff --git a/.gitignore b/.gitignore
index 48b8bf907..d872985e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 vendor/
+_proto/*.pb.go
diff --git a/_proto/aaa.proto b/_proto/aaa.proto
index 162b94b77..4db9d8f94 100644
--- a/_proto/aaa.proto
+++ b/_proto/aaa.proto
@@ -1,11 +1,6 @@
 syntax = "proto3";
 package hapi;
 
-message Chartfile {
-  string name = 1;
-  string version = 2;
-}
-
 message Chart {
   // Option 1: Chart is raw []byte data
   // Option 2: List of files as []byte data, with special treatment for Chart.yaml
diff --git a/_proto/chartfile.proto b/_proto/chartfile.proto
index df84dd387..07921f624 100644
--- a/_proto/chartfile.proto
+++ b/_proto/chartfile.proto
@@ -1,3 +1,36 @@
 syntax = "proto3";
 package hapi;
 
+// Maintainer is a chart maintainer
+message Maintainer {
+  // Name is a user name or organization name
+  string name = 1;
+  // Email is an optional email address to contact the named maintainer
+  string email = 2;
+}
+
+// Chartfile represents the structure of a Chart.yaml file.
+//
+// Spec: https://github.com/kubernetes/helm/blob/master/docs/design/chart_format.md#the-chart-file
+//
+// Fields:
+// - name: The name of the chart
+// - verison: The SemVer 2 conformant version of the chart
+// - description: A once-sentence description of the chart
+// - keywords: A list of string keywords
+message Chartfile {
+  // Name is the name of the chart
+  string name = 1;
+  // Version is the SemVer 2 version of the chart
+  string version = 2;
+  // Description is a sentence describing the chart
+  string description = 3;
+  // Keywords is a list of keywords describing the chart
+  repeated string keywords = 4;
+  // Maintainers is the set of maintainers of this chart
+  repeated Maintainer maintainers = 5;
+  // Source is the URL to the source code of this chart
+  string source = 6;
+  // Home is the URL to the chart's home page
+  string home = 7;
+}