diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 9c3d4df5d3..6c71c1afb0 100755
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,5 +1,5 @@
 name: datadog
-version: 0.5.0
+version: 0.6.0
 description: DataDog Agent
 keywords:
 - monitoring
diff --git a/stable/datadog/README.md b/stable/datadog/README.md
index 06e86c14af..b9a1de65f2 100644
--- a/stable/datadog/README.md
+++ b/stable/datadog/README.md
@@ -53,6 +53,8 @@ The following tables lists the configurable parameters of the Datadog chart and
 | `resources.limits.cpu`      | CPU resource limits                | 512Mi                                     |
 | `resources.requests.memory` | Memory resource requests           | 100m                                      |
 | `resources.limits.memory`   | Memory resource limits             | 256m                                      |
+| `daemonset.podAnnotations`  | Annotations to add to the DaemonSet's Pods | `nil`                             |
+| `daemonset.tolerations`     | List of node taints to tolerate (requires Kubernetes >= 1.6) | `nil`           |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml
index ad1021843d..13e4028d6f 100644
--- a/stable/datadog/templates/daemonset.yaml
+++ b/stable/datadog/templates/daemonset.yaml
@@ -12,6 +12,10 @@ spec:
       labels:
         app: {{ template "fullname" . }}
       name: {{ template "fullname" . }}
+      {{- if .Values.daemonset.podAnnotations }}
+      annotations:
+{{ toYaml .Values.daemonset.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       containers:
       - name: {{ .Chart.Name }}
@@ -89,5 +93,9 @@ spec:
         - name: autoconf
           configMap:
             name: {{ template "autoconf.fullname" . }}
+      {{- if .Values.daemonset.tolerations }}
+      tolerations:
+{{ toYaml .Values.daemonset.tolerations | indent 8 }}
+      {{- end }}
 {{ end }}
 {{ end }}
diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml
index b53084c446..6fb206b172 100644
--- a/stable/datadog/values.yaml
+++ b/stable/datadog/values.yaml
@@ -13,6 +13,13 @@ image:
 daemonset:
   enabled: true
 
+  ## Annotations to add to the DaemonSet's Pods
+  # podAnnotations:
+  #   scheduler.alpha.kubernetes.io/tolerations: '[{"key": "example", "value": "foo"}]'
+
+  ## Allow the DaemonSet to schedule on tainted nodes (requires Kubernetes >= 1.6)
+  # tolerations: []
+
 # Apart from DaemonSet, deploy Datadog agent pods and related service for
 # applications that want to send custom metrics. Provides DogStasD service.
 #