diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28fd46edfb4..ee60ac59979 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ IMPROVEMENTS:
   * client: Don't exec `uname -r` for node attribute kernel.version [GH-2380]
   * client: Artifact support for git and hg as well as netrc support [GH-2386]
   * client: Add metrics to show number of allocations on in each state [GH-2425]
+  * client: Add `NOMAD_{IP,PORT}_<task>_<label>` environment variables [GH-2426]
   * client: Reproducible Node ID on OSes that provide system-level UUID
     [GH-2277]
   * driver/docker: Add support for volume drivers [GH-2351]
diff --git a/client/driver/env/env.go b/client/driver/env/env.go
index 0887a0e8f09..c2aacd38332 100644
--- a/client/driver/env/env.go
+++ b/client/driver/env/env.go
@@ -50,7 +50,7 @@ const (
 
 	// AddrPrefix is the prefix for passing both dynamic and static port
 	// allocations to tasks.
-	// E.g$NOMAD_ADDR_http=127.0.0.1:80
+	// E.g $NOMAD_ADDR_http=127.0.0.1:80
 	AddrPrefix = "NOMAD_ADDR_"
 
 	// IpPrefix is the prefix for passing the IP of a port allocation to a task.
@@ -213,6 +213,10 @@ func (t *TaskEnvironment) Build() *TaskEnvironment {
 				for _, p := range ports {
 					key := fmt.Sprintf("%s%s_%s", AddrPrefix, taskName, p.Label)
 					t.TaskEnv[key] = fmt.Sprintf("%s:%d", nw.IP, p.Value)
+					key = fmt.Sprintf("%s%s_%s", IpPrefix, taskName, p.Label)
+					t.TaskEnv[key] = nw.IP
+					key = fmt.Sprintf("%s%s_%s", PortPrefix, taskName, p.Label)
+					t.TaskEnv[key] = strconv.Itoa(p.Value)
 				}
 			}
 		}
diff --git a/client/driver/env/env_test.go b/client/driver/env/env_test.go
index 60a441cdea9..dd8eddfb15b 100644
--- a/client/driver/env/env_test.go
+++ b/client/driver/env/env_test.go
@@ -160,6 +160,10 @@ func TestEnvironment_AsList(t *testing.T) {
 		"NOMAD_META_foo=baz",
 		"NOMAD_ADDR_web_main=192.168.0.100:5000",
 		"NOMAD_ADDR_web_http=192.168.0.100:2000",
+		"NOMAD_PORT_web_main=5000",
+		"NOMAD_PORT_web_http=2000",
+		"NOMAD_IP_web_main=192.168.0.100",
+		"NOMAD_IP_web_http=192.168.0.100",
 		"NOMAD_TASK_NAME=taskA",
 	}
 	allocID := fmt.Sprintf("NOMAD_ALLOC_ID=%s", a.ID)
@@ -167,7 +171,7 @@ func TestEnvironment_AsList(t *testing.T) {
 	sort.Strings(act)
 	sort.Strings(exp)
 	if !reflect.DeepEqual(act, exp) {
-		t.Fatalf("env.List() returned %v;\n want %v", act, exp)
+		t.Fatalf("env.List() returned %v;\n want:\n%v", strings.Join(act, "\n"), strings.Join(exp, "\n"))
 	}
 }
 
diff --git a/website/source/docs/runtime/environment.html.md b/website/source/docs/runtime/environment.html.md
index 75a90bbf06a..1b62d7af98f 100644
--- a/website/source/docs/runtime/environment.html.md
+++ b/website/source/docs/runtime/environment.html.md
@@ -73,9 +73,17 @@ environment variables.
     <td>The IP:Port pair of the port with the given label</td>
   </tr>
   <tr>
-    <td>`NOMAD_ADDR_<task>_<label`></td>
+    <td>`NOMAD_ADDR_<task>_<label>`</td>
     <td>The allocated address, given as IP:Port for the given label of other tasks in the same group</td>
   </tr>
+  <tr>
+    <td>`NOMAD_PORT_<task>_<label>`</td>
+    <td>The allocated port for the given label of other tasks in the same group</td>
+  </tr>
+  <tr>
+    <td>`NOMAD_IP_<task>_<label>`</td>
+    <td>The allocated IP address for the given label of other tasks in the same group</td>
+  </tr>
   <tr>
     <td>`NOMAD_HOST_PORT_<label>`</td>
     <td>The host port for the given label if the port is port mapped</td>