diff --git a/contrib/charts/cert-manager/templates/challenge-crd.yaml b/contrib/charts/cert-manager/templates/challenge-crd.yaml
new file mode 100644
index 000000000..266f5a3c0
--- /dev/null
+++ b/contrib/charts/cert-manager/templates/challenge-crd.yaml
@@ -0,0 +1,22 @@
+{{- if .Values.createCustomResource -}}
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: challenges.certmanager.k8s.io
+{{- if semverCompare ">=2.10-0" .Capabilities.TillerVersion.SemVer }}
+  annotations:
+    "helm.sh/hook": crd-install
+{{- end }}
+  labels:
+    app: {{ template "cert-manager.name" . }}
+    chart: {{ template "cert-manager.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Challenge
+    plural: challenges
+  scope: Namespaced
+{{- end -}}
diff --git a/contrib/charts/cert-manager/templates/order-crd.yaml b/contrib/charts/cert-manager/templates/order-crd.yaml
new file mode 100644
index 000000000..437e29a3b
--- /dev/null
+++ b/contrib/charts/cert-manager/templates/order-crd.yaml
@@ -0,0 +1,22 @@
+{{- if .Values.createCustomResource -}}
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: orders.certmanager.k8s.io
+{{- if semverCompare ">=2.10-0" .Capabilities.TillerVersion.SemVer }}
+  annotations:
+    "helm.sh/hook": crd-install
+{{- end }}
+  labels:
+    app: {{ template "cert-manager.name" . }}
+    chart: {{ template "cert-manager.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Order
+    plural: orders
+  scope: Namespaced
+{{- end -}}
diff --git a/contrib/charts/cert-manager/templates/rbac.yaml b/contrib/charts/cert-manager/templates/rbac.yaml
index c05376631..4d3532073 100644
--- a/contrib/charts/cert-manager/templates/rbac.yaml
+++ b/contrib/charts/cert-manager/templates/rbac.yaml
@@ -10,7 +10,7 @@ metadata:
     heritage: {{ .Release.Service }}
 rules:
   - apiGroups: ["certmanager.k8s.io"]
-    resources: ["certificates", "issuers", "clusterissuers"]
+    resources: ["certificates", "issuers", "clusterissuers", "orders", "challenges"]
     verbs: ["*"]
   - apiGroups: [""]
     resources: ["configmaps", "secrets", "events", "services", "pods"]
diff --git a/contrib/manifests/cert-manager/with-rbac.yaml b/contrib/manifests/cert-manager/with-rbac.yaml
index e3d5ae725..af50268bb 100644
--- a/contrib/manifests/cert-manager/with-rbac.yaml
+++ b/contrib/manifests/cert-manager/with-rbac.yaml
@@ -46,6 +46,24 @@ spec:
       - certs
       
 ---
+# Source: cert-manager/templates/challenge-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: challenges.certmanager.k8s.io
+  labels:
+    app: cert-manager
+    chart: cert-manager-v0.6.0-dev.1
+    release: cert-manager
+    heritage: Tiller
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Challenge
+    plural: challenges
+  scope: Namespaced
+---
 # Source: cert-manager/templates/clusterissuer-crd.yaml
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -86,6 +104,24 @@ spec:
     plural: issuers
   scope: Namespaced
 ---
+# Source: cert-manager/templates/order-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: orders.certmanager.k8s.io
+  labels:
+    app: cert-manager
+    chart: cert-manager-v0.6.0-dev.1
+    release: cert-manager
+    heritage: Tiller
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Order
+    plural: orders
+  scope: Namespaced
+---
 # Source: cert-manager/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -98,7 +134,7 @@ metadata:
     heritage: Tiller
 rules:
   - apiGroups: ["certmanager.k8s.io"]
-    resources: ["certificates", "issuers", "clusterissuers"]
+    resources: ["certificates", "issuers", "clusterissuers", "orders", "challenges"]
     verbs: ["*"]
   - apiGroups: [""]
     resources: ["configmaps", "secrets", "events", "services", "pods"]
diff --git a/contrib/manifests/cert-manager/without-rbac.yaml b/contrib/manifests/cert-manager/without-rbac.yaml
index c6ce23ea5..4417cfe43 100644
--- a/contrib/manifests/cert-manager/without-rbac.yaml
+++ b/contrib/manifests/cert-manager/without-rbac.yaml
@@ -34,6 +34,24 @@ spec:
       - certs
       
 ---
+# Source: cert-manager/templates/challenge-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: challenges.certmanager.k8s.io
+  labels:
+    app: cert-manager
+    chart: cert-manager-v0.6.0-dev.1
+    release: cert-manager
+    heritage: Tiller
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Challenge
+    plural: challenges
+  scope: Namespaced
+---
 # Source: cert-manager/templates/clusterissuer-crd.yaml
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -74,6 +92,24 @@ spec:
     plural: issuers
   scope: Namespaced
 ---
+# Source: cert-manager/templates/order-crd.yaml
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: orders.certmanager.k8s.io
+  labels:
+    app: cert-manager
+    chart: cert-manager-v0.6.0-dev.1
+    release: cert-manager
+    heritage: Tiller
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Order
+    plural: orders
+  scope: Namespaced
+---
 # Source: cert-manager/templates/deployment.yaml
 apiVersion: apps/v1beta1
 kind: Deployment