diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f173ff04..24eae5286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ IMPROVEMENTS:
   * driver/docker: Added TLS client options to the config file [GH-480]
   * core/api: Can list all known regions in the cluster [GH-495]
   * client/discovery: Added more consul client api configuration options [GH-503]
+  * jobspec: More flexibility in naming Services [GH-509]
 
 BUG FIXES:
 
diff --git a/website/source/docs/jobspec/servicediscovery.html.md b/website/source/docs/jobspec/servicediscovery.html.md
index 4bb6062e8..f0e146449 100644
--- a/website/source/docs/jobspec/servicediscovery.html.md
+++ b/website/source/docs/jobspec/servicediscovery.html.md
@@ -79,8 +79,10 @@ group "database" {
   name of a service is $(job-name)-$(task-group)-$(task-name). Users can
   explicitly name the service by specifying this option. If multiple services
   are defined for a Task then only one task can have the default name, all the
-  services have to be explicitly named. Nomad will add the prefix ```$(job-name
-  )-${task-group}-${task-name}``` prefix to each user defined name.
+  services have to be explicitly named. Users can add the following to the
+  service names: ```${JOB}```, ```${TASKGROUP}```, ```${TASK}```, ```${BASE}```. 
+  Nomad will replace them with the appropriate value of the Job, Task Group and 
+  Task Group name while registering the Job. ```${BASE}``` expands to ${JOB}-${TASKGROUP}-${TASK}
 
 * `tags`: A list of tags associated with this Service.