diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4eeaa5164..1aeb4215c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 0.4.0 (UNRELEASED)
 
+__BACKWARDS INCOMPATIBILITIES:__
+  * api: Tasks are no longer allowed to have slashes in their name [GH-1210]
+
 IMPROVEMENTS:
   * core: Scheduler reuses blocked evaluations to avoid unbounded creation of
     evaluations under high contention [GH-1199]
@@ -19,6 +22,7 @@ BUG FIXES:
     [GH-1128, GH-1153]
   * core: Fix blocked evaluations being run without properly accounting for
     priority [GH-1183]
+  * api: Tasks are no longer allowed to have slashes in their name [GH-1210]
   * discovery: Ensure service and check names are unique [GH-1143, GH-1144]
 
 ## 0.3.2 (April 22, 2016)
diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
index 761b3d88d..6f7be67ea 100644
--- a/nomad/structs/structs.go
+++ b/nomad/structs/structs.go
@@ -1742,6 +1742,8 @@ func (t *Task) Validate() error {
 		mErr.Errors = append(mErr.Errors, errors.New("Missing task name"))
 	}
 	if strings.ContainsAny(t.Name, `/\`) {
+		// We enforce this so that when creating the directory on disk it will
+		// not have any slashes.
 		mErr.Errors = append(mErr.Errors, errors.New("Task name can not include slashes"))
 	}
 	if t.Driver == "" {